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

Change-Id: Ia470a56187612d4607737410f1abfc8ffac17581