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

Change-Id: I9e6a556876a2ae485887b7b159329f582179a44a