Merge "Match WIFI_P2P data usage."