Merge "[wpa_supplicant] Cumulative patch from commit 59e9794c7" into sc-dev