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

Change-Id: I9744393bfd4adf8a3a366cbba815aa7bf1095dc2