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

Change-Id: I95f7c3a70a72f7e0a346f2da0c8b9bdfc07258cc