am 2324535e: Merge "CTS test fail because Zhuyin(Bopomofo) used." into klp-dev

* commit '2324535ec81f5daf5400e828bb31a6e8c3c558be':
  CTS test fail because Zhuyin(Bopomofo) used.