Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev