Merge "Allow SetupWizard to do WiFi scans if location off" am: c98b34bd am: 72510e62 am: cf146edb am: a6b37888 Change-Id: Id16507a948dec243f4f04afdc6e54668759a0fa9