am 58402c6d: am ac7f781a: am 962b2928: Merge "Fix RTSP urls." into jb-dev

* commit '58402c6d472f85ce6a82b8b84cf8836f7cb75d68':
  Fix RTSP urls.