Merge "Fix running with SERVICE_IP_VERSION=6"