Merge "[wpa_supplicant] Cumulative patch from 6151c9b90" into qt-dev
am: 200b74922b

Change-Id: Iae1ac541e9b798bd73bd45ccfc8639686f57c2f7