geoip: qualify vars

Change-Id: I1bcef13653dfdbadf710d7ef425d2f3dc8a8e6fc
Merge "geoip: qualify vars" into production