Merge changes from topic "COUNTRY_DETECTOR_API_ENHANCEMENT"

* changes:
  API Enhancement CountryDetector
  Revert CountryDetector changes