Merge "Fix statsd returning uidmap with empty reports." into pi-dev am: 0d3a6dee7f
am: 30b2280bbe

Change-Id: I27d74b551c56552542a2f56c64fb8326fabb9a9a