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

Change-Id: I82e809486787736acd0efe3069abb7339aab23a7