Merge "Refactor ValueMetricProducer"