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

Change-Id: I7a7291575cb26edf2d836221eb5a3253db084ac7