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

Change-Id: Ie0c9ff25ed2b1c51b7ad0c174a44707cf11dd09f