Merge "Do not reboot with commit failure when ext4 userdata is wiped"