[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6

Change-Id: Id889a60c71532bdd9a686182bc6d181b0f207f5d