am 133d0b70: am 185f1a96: Merge "IME test fixes." into froyo

Merge commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97' into kraken

* commit '133d0b70ff569dad9d996be49fdea10c2bdd4b97':
  IME test fixes.