Merge "NsdService: more cleanups"
am: 903d64634a

Change-Id: Id61e1e2e240134c44e06bc9d78075ffcff8b5ff6