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

Change-Id: I43838076b1afd2e6f2ca9e46e91187c3e2185fda