Merge "Fix an NPE in NsdManager"