Merge "Move NsdServiceTest to correct directory"