Merge "libsnapshot: Improve test reliability."