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