Merge "Add p2 option in openLogicalChannel." am: f954f2d5cc
am: 7c6fa75512

Change-Id: Iee6b5873353ea10262c9268989cbe5c2fd946cc7