Merge "libsnapshot: Don't accidentally delete snapshot when collapsing"
am: 48eb2ee176

Change-Id: Ibe795625cd858e7cf72dc0a7ac4d08bf2f081d7b