Merge "ota_from_target_files: Include the payload properties." am: db82f72752
am: 07085a5113

* commit '07085a511385a9dfa71414735641f96119ec342c':
  ota_from_target_files: Include the payload properties.