Merge "libsnapshot: Fix intermittent test failure due to missing null check."