Merge "dnsmsq: fix not properly handled null pointer checker" am: 81722a62bc
am: 18c5b68941

Change-Id: I397a97a399e2e1d5de7cde38825e9f54f6564f66