[wpa_supplicant] Cumulative patch from commit 0c5ededed am: b755a2a1f9

Change-Id: I98afedf8522d931d1bcb900402bab2b51d6fe943