Merge "Add hostapd V4 to baseline" into main