Merge "Add DnsResolverServiceManager"