Fix the labeling issue when mixing Japanese/Trad-Chinese.
am: 4b0653168f

Change-Id: I4e4bad172c397e33d7b13a9d6617d67ad2df4183