Merge "NsdService: more cleanups" am: 903d64634a
am: 49bc06d0f9

Change-Id: I908c067fd7931058ac8f171eed96061b12f7a961