Manually including geoip::data to ensure that proper data_directory is created

Change-Id: I452b69cb17c64da349cd4c06ae3a8da3a86eafe4
Merge "Manually including geoip::data to ensure that proper data_directory is created" into production