Merge "Refactor ChangeReporter and rate limit stats logging." am: 9a253e12cc am: 76191fa6b0
am: 604f8002d8

Change-Id: I5ed4a64b701041393026b742bc3f451d73c4ed33