Merge "ota_from_target_files: Include the payload properties."