Merge "skip the country code test when the country code is not support" into main