Merge "Fix flakiness of testTransferLaunchCookie"