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

Change-Id: I6ae82f5e4707b19753235eaa8bc4203b3181adfc