Merge "Wipe /data with ext4 before 16K OTA" into main