Merge "[CS] Add a generic transport-specific information API" am: 7f50b11c89 am: 14062aa659
am: 79cee813c9

Change-Id: I47e0a7d62434b05d4692f9835af93c3a5dd61027