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