Merge "Fix flaky AsyncBlockCheckFilterTest"