Merge "Stop setting the legacy net.dnsX system properties"