Merge "Remove usage of hidden InetSocketAddress constructor"