Fix up wifi initialization

Change-Id: I820e2845f2a030d497dbe3024806bd7652155533