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

Change-Id: Ia18813663121bcf80fbbfcdc46f0cc84f3c5c7f8