Merge "Remove duplicated code in IMMS" am: 5ab0fe1f56 am: d54852ab76
am: 7eb7fa6ceb

Change-Id: I8876ab9f6806ea07b46aa639577c7c2ce8635a16