am 2af58637: Merge "Add the Product ID to target_files.zip"

* commit '2af586376d2b99c75a5672c72a704f2031adc0fe':
  Add the Product ID to target_files.zip