Merge "Wifi p2p fix?" into nyc-dev