Merge "Update product_id and product_version location."