Changes to reflect spatiotemporal-data-android refactoring.