Merge "Fix the hostname for the IPv6 loopback address"