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

Change-Id: Ic5d4e87dc6811aae4d5347290110faeda2857eca