Redo Wifi logic

Change-Id: Icbbe61b951de2d21d53e8e1d710ee747bccb639a