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

Change-Id: I8ef0fc5a31b1120e031efa3e15c21d6d647766d7