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

Change-Id: Ie108224f4e8f28f63672d33b50e7ee8bf3a755fa