Merge "libsnapshot: Improve test reliability." am: c1c6008b78
am: 243ffd6522

Change-Id: Iac6971f33c6cb594e65216bc91222d4747be2ee0