Merge "Added APIs for Connection-oriented channels"