Add p2 option in OpenLogicalChannel
am: d87bd02d5a  -s ours

Change-Id: If4c8f514a6ebf36b1d5858fb2bde5e0bb330c247