Enable GeoData collection mode everywhere

Change-Id: I62473520dc74b0f6ab89fa8a216da8f38c61d0a5