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

Change-Id: I4ed6949a2057f59b8c601d190b1602b5aa4fea4c