Merge "Merge "NsdService: more cleanups" am: 903d64634a am: 49bc06d0f9" into nyc-mr2-dev-plus-aosp am: 1cb999f6c9
am: e3c7d23c84
Change-Id: I31844b115b151e7fc3ec0e5b30cfe214e91857c6
This commit is contained in: