[wpa_supplicant] Cumulative patch from commit 0c5ededed am: 1a1e642fd6

Change-Id: I48682c9c8a03b66b4c7e16985feb3e433949fdf9