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

Change-Id: Ib85c019740bd4b7f88d570dce86eb8c50fb9ee27