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