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

Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a