Merge "[wpa_supplicant] Cumulative patch from 6151c9b90" into qt-dev