Merge "NsdService: test coverage for client requests."