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

Change-Id: I20b73717f2f3ea41a57193f8c670cb26b7c66e25