Merge "Fix InputMethodInfoTest." into klp-modular-dev