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

Change-Id: I2850525ae1f63324d176f400eb7af4b2c995f0b0