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

Change-Id: I2d653362b4f1ad0584a04644503b13a0bdb67c6e