am 30b074fc: am 2495d08a: am 5327322a: Merge "Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"" into jb-mr1.1-dev

* commit '30b074fcbff6263db4044ff4e8f36eb5d4e136eb':
  Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"