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

* commit 'ff0bd468d8cf0f51c07927c758563a3f696c32a4':
  Disconnect on socket error on the RTSP control connection.