Merge "Add the Product ID to target_files.zip"