Merge "Revert "Temporarily disable NsdService unit tests"" into tm-dev