Merge "Fix non-deterministic async test"