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

Change-Id: If70fb160c90afbfb646ca7474d06fe735031aed5