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

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