Merge "Fix uidmap in statsd." into pi-dev