Merge "[CM] Fix comments, add tests to TransportInfo API"