Merge "Remove the metrics report in recovery system"
am: aff3248507

Change-Id: I62cd28099bb20ba2927f59554c81a2fdf4075626