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

Change-Id: Ib5a0042d7a4bf350253cb35bda79eb0d02e5ab3f