Merge "[wpa_supplicant] Cumulative patch from commit d68c0dd4d"