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

Change-Id: I22d1f733fdab84f3d83076eb9dd36260d5a7d194