Merge "Adjust wifi dialog for better accessibility" into pi-dev
am: e2d14d409e

Change-Id: I5dc74f51fdbcd00d0dd71d632313c60f200a639d