Merge "dnsmasq: disable dnsmasq service as default"