Merge "Add statsd flag namespaces"