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