Merge changes I229d25a7,I1bde4c60 into jb-dev

* changes:
  Fix BasicAdapterTest flakiness
  temporarily nuke RTSP tests until fixed DO NOT MERGE