Merge pull request #23761 from eileenmcnaughton/invalid_state_with_country