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

* commit '6170653ce520d957887aaaf710ec4b682b7eb3e0':
  Fix metricsd to conform to the lastest server schema