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

Change-Id: I6311c39ee5ea9abfa5b025315968d122f0d3f694