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

Change-Id: Id4f16292f94cb151093a2e578e194a09dcec84cf