Merge "Minor changes for DnsResolverTest"
am: e445f54934

Change-Id: I176d2e3538d20acef4e04f082735b55c5cca07e6