Merge "Add statsd flags to public namespaces" into sc-dev