Merge "Fix flaky NsdManagerTest"