IME fix

Change-Id: I0aeb73672986ffc2bd5ecf6039bdf8ba2cc562d3
Merge pull request #27 from singhdd93/cm-10.1

IME fix
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1