Merge "recovery_utils: remove FDE support"