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

* commit '4448f9d7ade3d08a29b1a191e182a403c5584388':
  Revert Japanese special case fallback keys.