Merge "Fixes serialization of vendor metrics" into pi-dev