Merge "[Bug 35738] remove zone info from ipv6 addresses"