Merge "NsdService: bootstrap unit tests"