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