Merge "Incorporate Native API council feedback into the Wifi HALs." into main