Merge "libsnapshot: Fix test failure in CancelOnTargetSlot."