Merge "Prevent SocketTest off-thread Exception from escaping"