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

Change-Id: Ia84f00aec9ab7f98804f583f9567ddd3216f7360