[Bug 226544] Merge Review: wpa_supplicant