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