Merge "libsnapshot: Fix typo in nullptr check" am: 17438477cb am: eea945690a
am: cf59a3e9b9

Change-Id: I43783517c737704230db555fd3a3a608cff2a36d