Merge "Modify NsdServiceTest to conform to its new mechanism"