* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed': Get rid of a race in NsdService in stopResolveService and getAddrInfo