Merge "Add visibility for statsd in prep for migration."