Merge "Add p2 option in OpenLogicalChannel" am: 7b3d8dd351 am: 61b16b3f02
am: 14ae693464

Change-Id: Id6532ce4b0b6d6959786862281370b8c98b0ac05