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

Change-Id: I95a6f6de1e24d55e9aec7d6e0a73740b5ed3b181