Merge "Tweak timing to reduce spurious failures"