Fix wifi on SetupWizard

Change-Id: I23195c983d9dadd6ff518c0f5d74850e032413ef
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2