Merge "[wpa_supplicant] cumilative patch from commit a8655be0b" into main