Merge "Move location-related code into client library"