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

Change-Id: Icb456bac6bf5bf357848d73356adbd8772c37817