am 1f762b34: am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev

* commit '1f762b3490ce3583354ac3bf23732e88ebdb7b81':
  Revert Japanese special case fallback keys.