Merge "Update to follow TransportMediator API changes." into jb-mr2-dev