Merge "[wpa_supplicant] Cumulative patch from fe468b071"