Merge "[wpa_supplicant] Cumulative patch from commit 27e828d72"