Merge "Minor changes for DnsResolverTest" into qt-dev
am: ac707024b2

Change-Id: I95e48ad3bdb5004e4acced034a6d6efac6f031c2