Merge "Restore ability for SSLSocket.close() to interrupt reads and writes"