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

Change-Id: I39efbd7172b0fb34a8490358a45f4f46ed1677c7