Merge from vendor branch WPA_SUPPLICANT: