Merge "p2p: sanity check for network name"