Merge "Added APIs for Connection-oriented channels"
am: e1992384e0

Change-Id: If7cb99a59aee8640f6dddd96f2388e2a5284df45