Merge "Fix NPE in NsdServiceTest"