Merge "Fix picle error on ota_from_target_files"