Merge "Add p2 option in OpenLogicalChannel" am: ca59e7f3ca am: c0e1a4d4e5
am: f94530dfd8

Change-Id: I6a274195065ab1ef8406849228f60859ee826e53