Merge "Fix SetCountryCode test when US is not supported"