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

Change-Id: Id30000a3062edc89d99eb7dc07748f18ddc50d2e