Merge "Add p2 option in OpenLogicalChannel"
am: ca59e7f3ca

Change-Id: Icc00d5644db5266ed82735ae0065a5fe802f9075