am 364a7d1c: (-s ours) am bc71d036: (-s ours) am 3e46ead6: (-s ours) am c2711274: Add tests for InputMethodSubtype. DO NOT MERGE * commit '364a7d1c': Add tests for InputMethodSubtype. DO NOT MERGE