Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/packages/inputmethods/LatinIME into lmp-mr1-dev-plus-aosp