Merge "Fixes serialization of vendor metrics" into pi-dev
am: 3abf7858bf

Change-Id: Icd95c01772229330c088074f569f824a5140ea2d