[wpa_supplicant] Cumulative patch from 89bbe6f87 am: 021b0b5d02
am: b01663cfcc

Change-Id: I6bf3f5fb22fca597751690aa6101645546a5fb1e