Merge "wpa_supplicant core change to support 11b only mode"