Merge "Keep the same DBLoadBalancerFactory in tests"