Merge "TcpSocketMonitor code hardening"