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

Change-Id: Ie78679bbb4f4789f4c25704f9560665adfc2ff54