Merge "Fix VIP IPv6 subnet discovery order"