Merge "request location based country detector in WiFi ON" into sc-dev