Always retrieve country in case it is in the conditional token
Change-Id: Iae7ca5ad18eb8e0e4de12574c35ed90e56de01e6