Merge "Add p2 option in OpenLogicalChannel" into oc-dev
am: f2df2614fc

Change-Id: Iaf974486e44e415b14174d6989e6bd5ae98150f0