Merge "Revert "Only use the IME target from IMMS to update the IME control target"" into rvc-dev am: e3b4daa804 am: 8ecb48c193 am: e049253602

Change-Id: Ia809c5797d47f558f38f12cdd9cf7188054fbcdd