Adding validation for country code
Also cleaning up a little in DonationData.

Change-Id: Ia7a20e63ea1ff23fd3faeb81c3f084854a236a8f