Android 7.1.1 release 60
Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev