Merge "libsnapshot: collapse fix sanity checks" am: c42f5d64e4
am: 4f5139e41a

Change-Id: If081c4136e1972c0492925b7b9df2b522cafbd73