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

Change-Id: If66053aeea42ac91f370fc69e2c2dd876f5c6b0d