Merge "Fix uidmap in statsd." into pi-dev am: d41fad71a6
am: bc341cdf02

Change-Id: I52167c72f6c544a29db71de93a57a241150f2bda