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

Change-Id: I0dfd2815874940624bbee2e02a506549fc68e070