Merge "Revert "Plumb IME subtype change from IMMS to IMS."" into pi-dev
am: 59444f6abf

Change-Id: Ibd6c9bc4bf05cd83d39964e085842902e599dbd5