Merge "Move country constraint logic into standalone class."
am: b33463c7cd

Change-Id: I89fc96f42158934dd10da45ec42ed88544b24f6a