Merge "metricsd: Use product id instead of build target id."