[wpa_supplicant] Cumulative patch from commit 0c5ededed am: 1a1e642fd6 am: c017484fca

Change-Id: Ieaf7cb35f76d3c8f5feb59746acf5ad64dfc16b1