Merge "metricsd: Don't upload if product id is empty."