Merge "Remove MetricLogger for unbundling"