Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480
am: e603fe8bc0

Change-Id: I54556ea99992fbc0105bc2012c3d423e88c60764