Merge "Fixing display option for KO, JA, ZH" into nyc-mr1-dev
am: 9bdcff7bdf

Change-Id: I5adb8fb17d4f00ac39d4ce3b78997af36556f20d