Merge "Frameworks: Replace deprecated MetricsLogger usage" am: dbe20066d3
am: e7eddfcee7

Change-Id: Ia58ab564f9eebf8ef2625bdfcee81553e1c0ad1c