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

Change-Id: I1f8c79d54a7634a7351de51d66c5a3e391201f7f