Merge "Remove transport dir name from TransportClient"