Merge "Fix statsd returning uidmap with empty reports." into pi-dev