Merge "Add a string message for Private DNS strict mode failure" into pi-dev