Merge "Remove use of streams in TransportManager"