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

Change-Id: Icf7ab12fdcb510b20c9254b4e184540757b5f063