Merge "CountryDetector: Enable detector class override for automotive"