Merge "Fixes statsd returning too much data at once." into pi-dev
am: cdb093e080

Change-Id: I64e129a2061c561ddb017067e095ed0e2e9d471b