Adapt to changes in data-values/geo 1.0.0

Change-Id: I94078a04bf628f5761c3fd90dff95b2a0bb32452
Merge "Adapt to changes in data-values/geo 1.0.0"