[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6 am: c62742ddc3

Change-Id: I8b9ba198602537d2e483d08f28c18e6ebda4ef6a