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

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