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

Change-Id: Ib3e4d69b94e6466c27dd8d47b928200b29bfae3f