am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

* commit 'd9435bcecc820c8715d8b6b920fd43042418a1e9':
  Do not merge. Backport two fixes for InputMethethodFramework