Merge "Fix NsdManagerTest failures"