Merge "Fix flakiness in BasicCallTests"