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

Change-Id: I1991e007068ee1a9944ca0a66b6444241aa51a18