Merge "IMMS should preserve selected IME upon boot" am: 154519eb52 am: f65fd37910
am: 55e0bad720

Change-Id: Idfe170b58bb07ba4775629d094b508c17a9aba9b