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