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

Change-Id: I6ebee0796c58bb6716285c3bb10d3bd7056efea1