Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main