Merge "Allow SetupWizard to do WiFi scans if location off" into nyc-mr1-dev am: cba436b312
am: 8d3fc0fd8a

Change-Id: I3002282020faf541fc37e1137a3c89d23b99f416