Fix wifi on SetupWizard

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