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