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

Change-Id: Idfcb6fe480477af27dc8f6e71ac0f0a1567f9610