Merge "Switch Geolocation DRT methods to control client-based mock"