Merge "Use statsd name in comments."