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

Change-Id: I4cfcd3d2a742d50e6cb0d492eddaf141e2222392