Merge "Updated: Wi-Fi p2p framework"