Android CTS 7.1 Release 8 (4226626)
Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev