Merge "Revert "Add a wrapper ConfigMetricReportList to hold multiple ConfigMetricReports""