Merge "Frameworks: Replace deprecated MetricsLogger usage"