Merge "Private DNS API: Follow-up on review"