Merge "NsdService: Clear client info after resolution request is serviced."