[wpa_supplicant] Cumulative patch from commit c54a5e96b am: e21d4e8dc6

Change-Id: I99a98b56351271fa3d9e6cec5f04932df40501ef