[wpa_supplicant] Cumulative patch from commit dd2daf084 am: 4fbc08f3cc am: 5405c8c800

Change-Id: Ica842240b57d79fc3403d64ff44774a8e6e220fb