Merge "Refactor to SimChangeListener class" am: a12217012e am: 74247b4ee8 am: 6dacd5ecf2
am: dc81bd74ae

Change-Id: Ifa36726ce67fd81ca508d5530b815f5e82557a89