Merge "libsnapshot: Fix flaky low-space tests."