Merge "Crypto changes for devices that don't write ext4 fs on wipe"