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

Change-Id: I142d76b90a2e1fe38a1bfdf4213030cf5d8f9007