Update GeoData to wmf/1.23wmf21 tip

Change-Id: I8054b17c7b1492f46efdb8c1a5e2d215f4e3ff8d
Merge "Update GeoData to wmf/1.23wmf21 tip" into wmf/1.23wmf21