am dbdc81a3: Merge "Cleanup InputMethodInfoCache"

* commit 'dbdc81a36ac44f217e14a660ac671562f2948d89':
  Cleanup InputMethodInfoCache