Merge "Fix testing IPv6 VIP network connectivity"