Merge "fix IME bug" into honeycomb