am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev

* commit 'c5dea68e9856698953dafca868eaee7207614641':
  Revert Japanese special case fallback keys.