Merge "Rate limit non statsd logs." am: e8e6390829 am: c1abc25905
am: 5912d35e17

Change-Id: I1f6571cdbb59eb086fe9e929712ed453ca5ae6d1