Merge "Fix the IPv6 tests for no ipv6-public-subnet"