am d7ba8143: Merge "Fix the issue on the inconsistent condition of InputMethodSubtype" into jb-dev

* commit 'd7ba81437020b45f8f33fef729820078b1cd2547':
  Fix the issue on the inconsistent condition of InputMethodSubtype