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

Change-Id: Icefdb0056c418bd93604e19ba543fa8489336391