Only add country field when it's in the schema

Change-Id: Id38ce4d20312bd15014cf37d521aac0a97bd660b
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/907
Merge "Only add country field when it's in the schema"