Merge "Log wipe failure" into pi-dev