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

Change-Id: Ib6605757514b90ec5fb2df03f08fc7d48d12e08e