Merge "[wpa_supplicant] Cumulative patch from commit e4eb009d9" into rvc-dev