Merge "Merge "Frameworks: Replace deprecated MetricsLogger usage" am: dbe20066 am: e7eddfce am: 99afea68"