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

Change-Id: Id2062f84318f16ef9d57423ded7da168eab0ef66