Merge "Removing fixup for f32 + dnsmasq 2.81"