Merge "p2p: mirgrate p2p into tethering modes"