am 7ecbf2b1: am fba7f5d7: Merge "Fix crash on simplified Chinese." into mnc-dev

* commit '7ecbf2b1a41e25a02c9f1b2bc743e6709e70c591':
  Fix crash on simplified Chinese.