Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev am: 057698e511
am: 6f206165f8

Change-Id: I5796aad5c053c6ea548451cc4b15dc3245aabd09