Merge "Add p2 option in OpenLogicalChannel" into oc-dev
am: ddeb776201  -s ours

Change-Id: Ia0a3a2afe643713dd9f6307532a1fda4d9fab46b