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