Merge "Add p2 option in OpenLogicalChannel"
am: 7b3d8dd351

Change-Id: Ie12e137f29e272cc921ddf71a19fcc4fe6773c8a