Merge "Improve the wifi description for the case of private DNS broken" am: 37b17ae752 am: 5eda5a3e7f am: 9b29332cd3
am: 06b7986eff

Change-Id: I7b73ebcefba1df293595d38069a06d5ac0b260b5