Merge "recovery: Clean up the log saving while wiping."