Merge "Add a unit test for ChangeReporter." am: 7b5773765f
am: d8891ccab7

Change-Id: I1018b49569ca40a7a4290edff55f584508c7b241