am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and...
am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '54ca9066':
Get rid of a race in NsdService in stopResolveService and getAddrInfo