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

Change-Id: I90b39bce4e5c31d83579054e1b0c8921e9c33810