am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP...
am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '9c981cd3':
Disconnect on socket error on the RTSP control connection.