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

Change-Id: Ibb097841adf8e91c2df1933169e2834208f72d76