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

Change-Id: I1e937c399c590b75ffd435333b32495538f1fa43