Merge "Minor change for async DNS API"