am 3da1568a: Merge "Update to follow TransportMediator API changes." into jb-mr2-dev

* commit '3da1568ae86f49fbe9f239e0e4f6d0389e4bacd7':
  Update to follow TransportMediator API changes.