Merge "Revert "Disable NsdManager tests that need a new prebuilt"" into tm-dev