Update GeoData to master

Change-Id: I440066ba898af42a3e3c17f4948107f5c4815924