Merge "Update permission check to use Statsd's uid"