Merge "Fix race condition in NsdManagerTest"