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

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