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

Change-Id: I399cfb6090f81e58cb79de8654d116c7ce1648be