Merge "NsdService: more cleanups"