Merge "recovery: Address the ioctl denials during wiping."