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

Change-Id: Iccde94bb855b3461ddb804b69182c439f9c07e1f