Merge "metricsd: Don\'t upload if product id is empty." am: 0ba2606444
am: f826969e10

* commit 'f826969e1035d289d451f2151eb5578610317d3d':
  metricsd: Don't upload if product id is empty.