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: 8ecb48c1 am: e0492536
Change-Id: Ia809c5797d47f558f38f12cdd9cf7188054fbcdd