Merge "Reduce statsd log data size." into pi-dev am: b85e5616df
am: f308d98f79

Change-Id: I2ac1c09c4473eb31ed163395272b6ccfaba51917