Merge "p2p: support find a specific channel"