Merge "libsnapshot: Don't accidentally delete snapshot when collapsing" am: 48eb2ee176 am: 44d025d928 am: 8786b58b6d
am: e3a18c1c2c

Change-Id: Iaf8e365edb6a2fde00825b55f485027d7f45d83c