Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev