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