am 82e047b1: am 91c40cdc: wpa_supplicant: P2P-related fixes

* commit '82e047b15c0e3a5935cef15fe6461633db5d3ab4':
  wpa_supplicant: P2P-related fixes