Merge "Move country constraint logic into standalone class."