Merge "libsnapshot: bootloader rejects wipe in proper time."
am: ddbcba794e

Change-Id: I3e33496eaa7fb50a77e9f5d5c76855dc7f89cb90