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

Change-Id: Iba33a00ccde9c75b27e25f98a95f9bd501ba2d3a