Merge "NsdManager: add unit tests"