Merge "Merge "Added APIs for Connection-oriented channels" am: e1992384e0 am: 288915bedc am: 39f133eed2"