Merge "libsnapshot: fix null pointer deref"