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

* commit 'db82f72752532bf2b98103171b3d7cd8405b88e4':
  ota_from_target_files: Include the payload properties.