Merge "libsnapshot: fix null pointer deref" am: f3700b9e42

Change-Id: I5c21edc690f3ea5e428f6ea0e1cae6f6c979e63d