Merge "Add debug support for P2P WPS"