Merge "IME test fixes." into froyo