Merge "Revert "Only use the IME target from IMMS to update the IME control target"" into rvc-dev am: e3b4daa804 am: 8ecb48c193 am: cc33820e5d am: 1b122416ad

Change-Id: I18e94a7f91ced7298ae8b9d27b97abce2a806ce6