Remove redundant countryGraph

Change-Id: Id2ae324e66b95ddd64dd3d64d6fd2e3744416f4d
Merge "Remove redundant countryGraph"