Merge "Log wipe failure" into pi-dev am: 9cf46fd625
am: 69e93ee993

Change-Id: I09dfe69ecde525bd7dd6f060903ba36c58faad6e