Fix p2p and wpa services init pt2