Merge "Refactor Statsd classes to enable null collector to work."