Merge "Remove unused APIs from MetricsFeatureProvider"