Merge "Fix bug in statsd with uid memory guardrail"