Merge "wifi: Do not use prefix for p2p commands" into klp-dev