Merge "wpa_supplicant_lib: Sync to wpa_supplicant b834952"