Merge "Improve the wifi description for the case of private DNS broken"