Merge "libsnapshot: bootloader rejects wipe in proper time." am: ddbcba794e am: 5747dfa931
am: 9bf2c13af6

Change-Id: Idb3d1db9d6662261ba56b39ac012ab7e4957b956