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

Change-Id: Ib4468dc91eae1f6c26cdde4b70e911aa38696e27