Merge "Refactor MetricProducer so that a big chunk of boiler plate code can be removed."