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