Merge "Fix metricsd to conform to the lastest server schema"
am: 2fcf449886

* commit '2fcf449886a52d47a4b57279993e59b13d3be1cb':
  Fix metricsd to conform to the lastest server schema