[Bug 226544] New: Merge Review: wpa_supplicant