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

Change-Id: I79b2537608bff549e02e06bdd030814bfa0b62f1