STFU update-geodata

Change-Id: I7067297e2e83fdfe63876addbd0269a575031753
Merge "STFU update-geodata" into production