Merge "Only use the IME target from IMMS to update the IME control target" into rvc-dev am: b7dda7d9d5 am: b6e6c540f8 am: b9ee44f73e

Change-Id: Ia46a364631749270cce47af08f8e73744473d998