Merge "P2P: support p2p configuration for the dedicated P2P interface"