Merge "Revert "Only use the IME target from IMMS to update the IME control...
Merge "Revert "Only use the IME target from IMMS to update the IME control target"" into rvc-dev am: e3b4daa8 am: 45abb13e
Change-Id: I6148c18643e900b7e5de5c3d05fa5e7e2517896a