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