[wpa_supplicant] Cumulative patch from commit 0c5ededed am: b755a2a1f9 am: dbd0ccd3c1

Change-Id: I0ec1f4fdb8dd03993b29daee0f4a3c2fc140273d