Merge "Comment clean up for InputMethodSubtype."