Fixes metrics reporting

Change-Id: I691414d4ded032175af3fea74616af7874f23074
3 files changed