Merge "Allow SetupWizard to do WiFi scans if location off"
am: c98b34bdce

Change-Id: Ibfd31e4ce200479201abb14c28d883b556a62b6b