Merge "Clean up service-statsd"