Merge "more testable MetricsLogger interface"