Merge "CountryDetector no longer requires location permissions." into mnc-dev