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

Change-Id: I4af55d71ed16a1e4702ed02a5751105f33327cbb