Merge "Discourage developers from catching subclasses of SocketException."