Merge "Accept more than one SD in NsdManagerTest"