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

Change-Id: I30a8922de9dc48722f71ee4647ada0013d464528