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

Change-Id: If122146d062cbfdeeea7c3a4d4358ca57ad1ce4c