Merge "fastboot: preserve partition_type if wants_wipe=true"