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