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

Change-Id: Id90e7f5b63e296cc60d64ae0ef2e4ef46e0c20ae