Update GeoData to master tip

Change-Id: I647e83f022144bc0bb75df0d175e86c95d69c9ad