Android 7.1.1 Release 57 (NGI77B)
Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev