Merge "Merge "NsdService: more cleanups" am: 903d64634a am: 49bc06d0f9" into nyc-mr2-dev-plus-aosp