Merge "p2p: skip p2p test if p2p is not supported"