Merge "Fix metricsd to conform to the lastest server schema"