Merge "Move transport client code into its own lib"