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

Change-Id: I9da6925b538c8ff527a3501df16471d5462a8eec