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

Change-Id: I487acdeba0002c2d7403edad751396e8b6fa19c8