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

Change-Id: I38181a7c09faec00ac5d24c9e8014c46133d13c5