Adding in hostapd related changes.