am 2a77d463: am 592988d3: Add unit tests for Japanization and fix several bugs.

Merge commit '2a77d4633aae1d04054fb09850d7939aa386b0a0'

* commit '2a77d4633aae1d04054fb09850d7939aa386b0a0':
  Add unit tests for Japanization and fix several bugs.