Merge "recovery: Clean up the log saving while wiping." am: 28bbe029b6 am: 7294a8830b
am: 495478e853

Change-Id: I6d64980838979f65a6240e5e95d54ea733e8cc58