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

Change-Id: I39c5330ffa5f80369b3a924b19337a0058a4eb16