Merge "libsnapshot: fix null pointer deref" am: f3700b9e42 am: a996f11aac am: 75e39bc646

Change-Id: I581342c005f01386fbe047ba5f798c12ed0f22a1