Merge "Use statsd constants instead of literals"