diff --git a/mapbox/app/build.gradle b/mapbox/app/build.gradle
index 80da05ea6..9edb3c7fc 100644
--- a/mapbox/app/build.gradle
+++ b/mapbox/app/build.gradle
@@ -59,6 +59,9 @@ dependencies {
     // Google Play Services
     compile rootProject.ext.dep.gmsLocation
 
+    // LOST
+    compile rootProject.ext.dep.lost
+
     // Picasso (Static Image)
     compile rootProject.ext.dep.picasso
 
diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java
index 6ec668956..686bc8020 100644
--- a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java
+++ b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java
@@ -14,9 +14,9 @@
 import android.widget.Toast;
 
 import com.mapbox.services.android.geocoder.AndroidGeocoder;
-import com.mapbox.services.android.telemetry.location.AndroidLocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngineListener;
+import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.android.testapp.geocoding.service.Constants;
 import com.mapbox.services.android.testapp.geocoding.service.FetchAddressIntentService;
@@ -122,10 +122,14 @@ private void updateValuesFromBundle(Bundle savedInstanceState) {
   }
 
   /**
-   * Builds Android location engine
+   * Builds location engine
    */
-  private synchronized void buildAndroidLocationEngine() {
-    locationEngine = AndroidLocationEngine.getLocationEngine(this);
+  private void buildAndroidLocationEngine() {
+    LocationEngineProvider locationEngineProvider = new LocationEngineProvider(this);
+    locationEngine = locationEngineProvider.obtainLocationEngineBy(LocationEngine.Type.GOOGLE_PLAY_SERVICES);
+    if (locationEngine == null) {
+      locationEngine = locationEngineProvider.obtainBestLocationEngineAvailable();
+    }
     locationEngine.addLocationEngineListener(this);
     locationEngine.activate();
   }
@@ -264,8 +268,8 @@ private static class AddressResultReceiver extends ResultReceiver {
     private final WeakReference<ProgressBar> progressBarReference;
     private final WeakReference<Button> fetchAddressButtonReference;
 
-    public AddressResultReceiver(Handler handler, Context context, TextView resultTextView, ProgressBar progressBar,
-                                 Button fetchAddressButton) {
+    AddressResultReceiver(Handler handler, Context context, TextView resultTextView, ProgressBar progressBar,
+                          Button fetchAddressButton) {
       super(handler);
       this.contextReference = new WeakReference<>(context);
       this.textViewReference = new WeakReference<>(resultTextView);
diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java
index 7ba717e3c..dcda05ff3 100644
--- a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java
+++ b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java
@@ -13,9 +13,9 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.services.android.location.LostLocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngineListener;
+import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.android.testapp.Utils;
 import com.mapbox.services.android.ui.geocoder.GeocoderAutoCompleteView;
@@ -63,7 +63,11 @@ public void onMapReady(MapboxMap mapboxMapReady) {
     });
 
     // Set up location services to improve accuracy
-    locationEngine = LostLocationEngine.getLocationEngine(this);
+    LocationEngineProvider locationEngineProvider = new LocationEngineProvider(this);
+    locationEngine = locationEngineProvider.obtainLocationEngineBy(LocationEngine.Type.LOST);
+    if (locationEngine == null) {
+      locationEngine = locationEngineProvider.obtainLocationEngineBy(LocationEngine.Type.ANDROID);
+    }
     locationEngine.addLocationEngineListener(this);
     locationEngine.activate();
   }
@@ -77,7 +81,7 @@ public void onConnected() {
   @Override
   public void onLocationChanged(Location location) {
     if (location != null) {
-      Log.d(LOG_TAG, "New LOST location: " + location.toString());
+      Log.d(LOG_TAG, "New location: " + location.toString());
       autocomplete.setProximity(Position.fromCoordinates(
         location.getLongitude(), location.getLatitude()));
     }
diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java
index e0caad226..16d0fc862 100644
--- a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java
+++ b/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java
@@ -10,15 +10,19 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.mapbox.services.android.location.LostLocationEngine;
 import com.mapbox.services.android.location.MockLocationEngine;
-import com.mapbox.services.android.telemetry.location.AndroidLocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngineListener;
 import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
+import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.commons.models.Position;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import timber.log.Timber;
 
 public class LocationEngineActivity extends AppCompatActivity
@@ -28,6 +32,9 @@ public class LocationEngineActivity extends AppCompatActivity
 
   private TextView textLocation;
   private LocationEngine locationEngine;
+  private String[] locationEngines;
+  private LocationEngineProvider locationEngineProvider;
+  private Map<String, LocationEngine.Type> locationEngineDictionary;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -35,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_location_engine);
     textLocation = (TextView) findViewById(R.id.text_location);
     setupSpinner();
+    setupLocationEngines();
   }
 
   @Override
@@ -55,38 +63,22 @@ protected void onPause() {
     }
   }
 
-  private void setupSpinner() {
-    Spinner spinner = (Spinner) findViewById(R.id.spinner_engine);
-
-    ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
-      R.array.location_engines, android.R.layout.simple_spinner_item);
-    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-    spinner.setAdapter(adapter);
-
-    spinner.setOnItemSelectedListener(this);
-  }
-
   @Override
   public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
     String engineName = (String) parent.getItemAtPosition(pos);
     Log.d(LOG_TAG, "Engine selected: " + engineName);
     setNoEngine();
 
-    String[] locationEngines = getResources().getStringArray(R.array.location_engines);
     if (engineName.equals(locationEngines[1])) {
       // Mock
       locationEngine = new MockLocationEngine();
       ((MockLocationEngine) locationEngine).setLastLocation(Position.fromLngLat(-87.62877, 41.87827));
       ((MockLocationEngine) locationEngine).moveToLocation(Position.fromLngLat(-87.6633, 41.8850));
-    } else if (engineName.equals(locationEngines[2])) {
-      // Android
-      locationEngine = AndroidLocationEngine.getLocationEngine(this);
-    } else if (engineName.equals(locationEngines[3])) {
-      // Lost
-      locationEngine = LostLocationEngine.getLocationEngine(this);
-    } else if (engineName.equals(locationEngines[4])) {
-      // Google Play Services
-      locationEngine = GoogleLocationEngine.getLocationEngine(this);
+    } else if (!engineName.equals(locationEngines[0])) {
+      locationEngine = locationEngineProvider.obtainLocationEngineBy(locationEngineDictionary.get(engineName));
+      if (locationEngine == null) {
+        locationEngine = locationEngineProvider.obtainLocationEngineBy(LocationEngine.Type.ANDROID);
+      }
     }
 
     if (!engineName.equals(locationEngines[0]) && locationEngine != null) {
@@ -104,17 +96,6 @@ public void onNothingSelected(AdapterView<?> adapterView) {
     setNoEngine();
   }
 
-  private void setNoEngine() {
-    if (locationEngine != null) {
-      locationEngine.removeLocationUpdates();
-      locationEngine.removeLocationEngineListener(this);
-      locationEngine.deactivate();
-    }
-
-    textLocation.setText("No location updates, yet.");
-    locationEngine = null;
-  }
-
   @Override
   public void onConnected() {
     Log.d(LOG_TAG, "Connected to engine, we can now request updates.");
@@ -128,4 +109,48 @@ public void onLocationChanged(Location location) {
       textLocation.setText(location.toString());
     }
   }
+
+  private void setupSpinner() {
+    Spinner spinner = (Spinner) findViewById(R.id.spinner_engine);
+
+    ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
+      R.array.location_engines, android.R.layout.simple_spinner_item);
+    adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+    spinner.setAdapter(adapter);
+
+    spinner.setOnItemSelectedListener(this);
+  }
+
+  private void setupLocationEngines() {
+    locationEngines = getResources().getStringArray(R.array.location_engines);
+    locationEngineProvider = new LocationEngineProvider(this);
+    locationEngineDictionary = obtainLocationEngineDictionary(locationEngines);
+  }
+
+  private Map<String, LocationEngine.Type> obtainLocationEngineDictionary(String[] locationEngines) {
+    List<LocationEngine.Type> values = Arrays.asList(LocationEngine.Type.values());
+    int mockLocationEngineAlreadyIncluded = 1;
+    int size = values.size() - mockLocationEngineAlreadyIncluded;
+    Map<String, LocationEngine.Type> dictionary = new HashMap<>(size);
+    for (int i = 2; i < locationEngines.length; i++) {
+      for (LocationEngine.Type type : values) {
+        if (locationEngines[i].equalsIgnoreCase(type.name())) {
+          dictionary.put(locationEngines[i], type);
+          break;
+        }
+      }
+    }
+    return dictionary;
+  }
+
+  private void setNoEngine() {
+    if (locationEngine != null) {
+      locationEngine.removeLocationUpdates();
+      locationEngine.removeLocationEngineListener(this);
+      locationEngine.deactivate();
+    }
+
+    textLocation.setText("No location updates, yet.");
+    locationEngine = null;
+  }
 }
diff --git a/mapbox/app/src/main/res/values/strings.xml b/mapbox/app/src/main/res/values/strings.xml
index cf7ebd61b..f08dcafdd 100644
--- a/mapbox/app/src/main/res/values/strings.xml
+++ b/mapbox/app/src/main/res/values/strings.xml
@@ -90,7 +90,7 @@
         <item>Mock</item>
         <item>Android</item>
         <item>Lost</item>
-        <item>Google Play Services</item>
+        <item>Google_Play_Services</item>
     </string-array>
 
 </resources>
diff --git a/mapbox/dependencies.gradle b/mapbox/dependencies.gradle
index a28570af1..7cfa012ea 100644
--- a/mapbox/dependencies.gradle
+++ b/mapbox/dependencies.gradle
@@ -6,18 +6,18 @@ ext {
     minSdkVersion = 15
     targetSdkVersion = 25
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.2"
+    buildToolsVersion = "25.0.3"
 
     dep = [
             // Support
-            supportAppcompat     : 'com.android.support:appcompat-v7:25.1.0',
-            supportCompat        : 'com.android.support:support-compat:25.1.0',
-            supportDesign        : 'com.android.support:design:25.1.0',
-            supportRecyclerview  : 'com.android.support:recyclerview-v7:25.1.0',
-            supportCardView      : 'com.android.support:cardview-v7:25.1.0',
+            supportAppcompat     : 'com.android.support:appcompat-v7:25.3.1',
+            supportCompat        : 'com.android.support:support-compat:25.3.1',
+            supportDesign        : 'com.android.support:design:25.3.1',
+            supportRecyclerview  : 'com.android.support:recyclerview-v7:25.3.1',
+            supportCardView      : 'com.android.support:cardview-v7:25.3.1',
 
             // mapbox
-            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-SNAPSHOT@aar',
+            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.4@aar',
 
             // gson
             gson                 : 'com.google.code.gson:gson:2.8.0',
@@ -36,7 +36,7 @@ ext {
             okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.6.0',
 
             // lost
-            lost                 : 'com.mapzen.android:lost:1.1.1',
+            lost                 : 'com.mapzen.android:lost:3.0.3',
 
             // play services
             gmsLocation          : 'com.google.android.gms:play-services-location:10.2.0',
diff --git a/mapbox/libandroid-services/build.gradle b/mapbox/libandroid-services/build.gradle
index 2ff4b30e8..17bb06693 100644
--- a/mapbox/libandroid-services/build.gradle
+++ b/mapbox/libandroid-services/build.gradle
@@ -42,11 +42,6 @@ dependencies {
     // Timber for logging
     compile rootProject.ext.dep.timber
 
-    // LOST
-    compile(rootProject.ext.dep.lost) {
-        exclude group: 'com.google.guava'
-    }
-
     // Testing
     testCompile rootProject.ext.dep.mockito
     testCompile rootProject.ext.dep.okhttp3Mockwebserver
diff --git a/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java b/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java
index e735d268c..7268a4ddd 100644
--- a/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java
+++ b/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java
@@ -179,6 +179,11 @@ public void removeLocationUpdates() {
     }
   }
 
+  @Override
+  public Type obtainType() {
+    return Type.MOCK;
+  }
+
   /*
    * Logic methods for getting the user positions.
    */
diff --git a/mapbox/libandroid-telemetry/build.gradle b/mapbox/libandroid-telemetry/build.gradle
index e08665046..accaeaa8d 100644
--- a/mapbox/libandroid-telemetry/build.gradle
+++ b/mapbox/libandroid-telemetry/build.gradle
@@ -32,11 +32,19 @@ dependencies {
     // OkHttp for network requests
     compile rootProject.ext.dep.okhttp3
 
+    // Google Play Services
+    provided rootProject.ext.dep.gmsLocation
+
+    // LOST
+    provided rootProject.ext.dep.lost
+
     // Testing
     testCompile rootProject.ext.dep.junit
     androidTestCompile(rootProject.ext.dep.supportEspresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    testCompile rootProject.ext.dep.junit
+    testCompile rootProject.ext.dep.mockito
 }
 
 apply from: 'gradle-javadoc.gradle'
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
index 681bc4333..d4a8da888 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java
@@ -25,9 +25,9 @@
 import com.mapbox.services.android.telemetry.connectivity.ConnectivityReceiver;
 import com.mapbox.services.android.telemetry.constants.TelemetryConstants;
 import com.mapbox.services.android.telemetry.http.TelemetryClient;
-import com.mapbox.services.android.telemetry.location.AndroidLocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngine;
 import com.mapbox.services.android.telemetry.location.LocationEngineListener;
+import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.telemetry.navigation.MapboxNavigationEvent;
 import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
 import com.mapbox.services.android.telemetry.service.TelemetryService;
@@ -128,11 +128,11 @@ public void initialize(@NonNull Context context, @NonNull String accessToken, @N
   /**
    * Initialize MapboxTelemetry - with sdkIdentifier + sdkVersion
    *
-   * @param context        The context associated with the application
-   * @param accessToken    The accessToken associated with the application
-   * @param userAgent      source of requests
-   * @param sdkIdentifier  Identifies which sdk is sending the event
-   * @param sdkVersion     version of the sdk sending the event
+   * @param context       The context associated with the application
+   * @param accessToken   The accessToken associated with the application
+   * @param userAgent     source of requests
+   * @param sdkIdentifier Identifies which sdk is sending the event
+   * @param sdkVersion    version of the sdk sending the event
    */
 
   public void initialize(@NonNull Context context, @NonNull String accessToken, @NonNull String userAgent,
@@ -476,9 +476,11 @@ public void run() {
   }
 
   private void registerLocationUpdates() {
-    if (locationEngine == null) {
-      locationEngine = new AndroidLocationEngine(context);
-    }
+    // TODO This has to be uncommented when https://github.com/mapbox/mapbox-gl-native/pull/9488 lands
+    // if (locationEngine == null) {
+    LocationEngineProvider locationEngineProvider = new LocationEngineProvider(context);
+    locationEngine = locationEngineProvider.obtainBestLocationEngineAvailable();
+    // }
 
     locationEngine.addLocationEngineListener(this);
     locationEngine.activate();
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngine.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngine.java
index 84d21e4b9..8d1cdaabd 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngine.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngine.java
@@ -92,21 +92,6 @@ public void setPriority(int priority) {
     updateCurrentProvider();
   }
 
-  private void updateCurrentProvider() {
-    // We might want to explore android.location.Criteria here.
-    if (priority == LocationEnginePriority.NO_POWER) {
-      currentProvider = LocationManager.PASSIVE_PROVIDER;
-    } else if (priority == LocationEnginePriority.LOW_POWER) {
-      currentProvider = LocationManager.NETWORK_PROVIDER;
-    } else if (priority == LocationEnginePriority.BALANCED_POWER_ACCURACY) {
-      currentProvider = LocationManager.NETWORK_PROVIDER;
-    } else if (priority == LocationEnginePriority.HIGH_ACCURACY) {
-      currentProvider = LocationManager.GPS_PROVIDER;
-    }
-
-    Log.d(LOG_TAG, String.format("Priority set to %d (current provider is %s).", priority, currentProvider));
-  }
-
   @Override
   public void removeLocationUpdates() {
     if (PermissionsManager.areLocationPermissionsGranted(context.get())) {
@@ -115,6 +100,11 @@ public void removeLocationUpdates() {
     }
   }
 
+  @Override
+  public Type obtainType() {
+    return Type.ANDROID;
+  }
+
   /**
    * Called when the location has changed.
    */
@@ -150,4 +140,19 @@ public void onProviderEnabled(String provider) {
   public void onProviderDisabled(String provider) {
     Log.v(LOG_TAG, String.format("Provider %s was disabled (current provider is %s).", provider, currentProvider));
   }
+
+  private void updateCurrentProvider() {
+    // We might want to explore android.location.Criteria here.
+    if (priority == LocationEnginePriority.NO_POWER) {
+      currentProvider = LocationManager.PASSIVE_PROVIDER;
+    } else if (priority == LocationEnginePriority.LOW_POWER) {
+      currentProvider = LocationManager.NETWORK_PROVIDER;
+    } else if (priority == LocationEnginePriority.BALANCED_POWER_ACCURACY) {
+      currentProvider = LocationManager.NETWORK_PROVIDER;
+    } else if (priority == LocationEnginePriority.HIGH_ACCURACY) {
+      currentProvider = LocationManager.GPS_PROVIDER;
+    }
+
+    Log.d(LOG_TAG, String.format("Priority set to %d (current provider is %s).", priority, currentProvider));
+  }
 }
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngineFactory.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngineFactory.java
new file mode 100644
index 000000000..c44d49afc
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/AndroidLocationEngineFactory.java
@@ -0,0 +1,17 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+import android.content.Context;
+
+class AndroidLocationEngineFactory implements LocationEngineSupplier {
+
+  @Override
+  public LocationEngine supply(Context context) {
+    return AndroidLocationEngine.getLocationEngine(context);
+  }
+
+  @Override
+  public boolean hasDependencyOnClasspath() {
+    return true;
+  }
+}
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/ClasspathChecker.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/ClasspathChecker.java
new file mode 100644
index 000000000..f4b037cbe
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/ClasspathChecker.java
@@ -0,0 +1,15 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+class ClasspathChecker {
+
+  boolean hasDependencyOnClasspath(String className) {
+    try {
+      Class.forName(className);
+      return true;
+    } catch (ClassNotFoundException ignored) {
+      // Empty
+    }
+    return false;
+  }
+}
diff --git a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/GoogleLocationEngine.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngine.java
similarity index 88%
rename from mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/GoogleLocationEngine.java
rename to mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngine.java
index 2e9c876f3..b40f5d76a 100644
--- a/mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/GoogleLocationEngine.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngine.java
@@ -1,4 +1,4 @@
-package com.mapbox.services.android.testapp.location;
+package com.mapbox.services.android.telemetry.location;
 
 import android.content.Context;
 import android.location.Location;
@@ -12,9 +12,6 @@
 import com.google.android.gms.location.LocationListener;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
 
 import java.lang.ref.WeakReference;
 
@@ -97,12 +94,18 @@ public Location getLastLocation() {
 
   @Override
   public void requestLocationUpdates() {
-    // Common params
-    LocationRequest request = LocationRequest.create()
-      .setFastestInterval(1000)
-      .setSmallestDisplacement(3.0f);
+    LocationRequest request = LocationRequest.create();
+
+    if (interval != null) {
+      request.setInterval(interval);
+    }
+    if (fastestInterval != null) {
+      request.setFastestInterval(fastestInterval);
+    }
+    if (smallestDisplacement != null) {
+      request.setSmallestDisplacement(smallestDisplacement);
+    }
 
-    // Priority matching is straightforward
     if (priority == LocationEnginePriority.NO_POWER) {
       request.setPriority(LocationRequest.PRIORITY_NO_POWER);
     } else if (priority == LocationEnginePriority.LOW_POWER) {
@@ -126,6 +129,11 @@ public void removeLocationUpdates() {
     }
   }
 
+  @Override
+  public Type obtainType() {
+    return Type.GOOGLE_PLAY_SERVICES;
+  }
+
   @Override
   public void onLocationChanged(Location location) {
     for (LocationEngineListener listener : locationListeners) {
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngineFactory.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngineFactory.java
new file mode 100644
index 000000000..5ed7331c5
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/GoogleLocationEngineFactory.java
@@ -0,0 +1,24 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+import android.content.Context;
+
+class GoogleLocationEngineFactory implements LocationEngineSupplier {
+
+  private static final String GOOGLE_LOCATION_SERVICES = "com.google.android.gms.location.LocationServices";
+  private final ClasspathChecker classpathChecker;
+
+  GoogleLocationEngineFactory(ClasspathChecker classpathChecker) {
+    this.classpathChecker = classpathChecker;
+  }
+
+  @Override
+  public LocationEngine supply(Context context) {
+    return GoogleLocationEngine.getLocationEngine(context);
+  }
+
+  @Override
+  public boolean hasDependencyOnClasspath() {
+    return classpathChecker.hasDependencyOnClasspath(GOOGLE_LOCATION_SERVICES);
+  }
+}
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java
index 68328ebfe..42847b438 100644
--- a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngine.java
@@ -18,6 +18,9 @@
  * @since 2.0.0
  */
 public abstract class LocationEngine {
+  public enum Type {
+    GOOGLE_PLAY_SERVICES, LOST, ANDROID, MOCK
+  }
 
   private static final int TWO_MINUTES = 1000 * 60 * 2;
 
@@ -92,6 +95,8 @@ public LocationEngine() {
    */
   public abstract void removeLocationUpdates();
 
+  public abstract Type obtainType();
+
   /**
    * Get the current priority being used.
    *
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineProvider.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineProvider.java
new file mode 100644
index 000000000..92cc12b94
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineProvider.java
@@ -0,0 +1,70 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class LocationEngineProvider {
+  private Map<LocationEngine.Type, LocationEngine> locationEngineDictionary;
+  private static final List<LocationEngine.Type> OPTIONAL_LOCATION_ENGINES = new ArrayList<LocationEngine.Type>() {
+    {
+      add(LocationEngine.Type.GOOGLE_PLAY_SERVICES);
+      add(LocationEngine.Type.LOST);
+    }
+  };
+
+  public LocationEngineProvider(Context context) {
+    initAvailableLocationEngines(context);
+  }
+
+  @NonNull
+  public LocationEngine obtainBestLocationEngineAvailable() {
+    return obtainBestLocationEngine();
+  }
+
+  @Nullable
+  public LocationEngine obtainLocationEngineBy(LocationEngine.Type type) {
+    LocationEngine locationEngine = locationEngineDictionary.get(type);
+    return locationEngine;
+  }
+
+  private void initAvailableLocationEngines(Context context) {
+    locationEngineDictionary = new HashMap<>();
+    Map<LocationEngine.Type, LocationEngineSupplier> locationEnginesDictionary =
+      obtainDefaultLocationEnginesDictionary();
+    for (Map.Entry<LocationEngine.Type, LocationEngineSupplier> entry : locationEnginesDictionary.entrySet()) {
+      LocationEngineSupplier locationEngineSupplier = entry.getValue();
+      if (locationEngineSupplier.hasDependencyOnClasspath()) {
+        LocationEngine available = locationEngineSupplier.supply(context);
+        locationEngineDictionary.put(entry.getKey(), available);
+      }
+    }
+  }
+
+  private Map<LocationEngine.Type, LocationEngineSupplier> obtainDefaultLocationEnginesDictionary() {
+    ClasspathChecker classpathChecker = new ClasspathChecker();
+    Map<LocationEngine.Type, LocationEngineSupplier> locationSources = new HashMap<>();
+    locationSources.put(LocationEngine.Type.GOOGLE_PLAY_SERVICES, new GoogleLocationEngineFactory(classpathChecker));
+    locationSources.put(LocationEngine.Type.LOST, new LostLocationEngineFactory(classpathChecker));
+    locationSources.put(LocationEngine.Type.ANDROID, new AndroidLocationEngineFactory());
+
+    return locationSources;
+  }
+
+  private LocationEngine obtainBestLocationEngine() {
+    LocationEngine androidLocationEngine = locationEngineDictionary.get(LocationEngine.Type.ANDROID);
+    for (LocationEngine.Type type : OPTIONAL_LOCATION_ENGINES) {
+      LocationEngine bestLocationEngine = locationEngineDictionary.get(type);
+      if (bestLocationEngine != null) {
+        return bestLocationEngine;
+      }
+    }
+    return androidLocationEngine;
+  }
+}
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineSupplier.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineSupplier.java
new file mode 100644
index 000000000..cf99c6eb1
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LocationEngineSupplier.java
@@ -0,0 +1,11 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+import android.content.Context;
+
+interface LocationEngineSupplier {
+
+  LocationEngine supply(Context context);
+
+  boolean hasDependencyOnClasspath();
+}
diff --git a/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngine.java
similarity index 79%
rename from mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java
rename to mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngine.java
index 753cd835a..f72629156 100644
--- a/mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngine.java
@@ -1,12 +1,10 @@
-package com.mapbox.services.android.location;
+package com.mapbox.services.android.telemetry.location;
 
 import android.content.Context;
 import android.location.Location;
 import android.support.annotation.Nullable;
+import android.util.Log;
 
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
 import com.mapzen.android.lost.api.LocationListener;
 import com.mapzen.android.lost.api.LocationRequest;
 import com.mapzen.android.lost.api.LocationServices;
@@ -17,7 +15,10 @@
 /**
  * Sample LocationEngine using the Open Source Lost library
  */
-public class LostLocationEngine extends LocationEngine implements LocationListener {
+public class LostLocationEngine extends LocationEngine implements
+  LostApiClient.ConnectionCallbacks, LocationListener {
+
+  private static final String LOG_TAG = LostLocationEngine.class.getSimpleName();
 
   private static LocationEngine instance;
 
@@ -27,7 +28,9 @@ public class LostLocationEngine extends LocationEngine implements LocationListen
   public LostLocationEngine(Context context) {
     super();
     this.context = new WeakReference<>(context);
-    lostApiClient = new LostApiClient.Builder(this.context.get()).build();
+    lostApiClient = new LostApiClient.Builder(this.context.get())
+      .addConnectionCallbacks(this)
+      .build();
   }
 
   public static synchronized LocationEngine getLocationEngine(Context context) {
@@ -44,12 +47,9 @@ public static synchronized LocationEngine getLocationEngine(Context context) {
    */
   @Override
   public void activate() {
-    if (!lostApiClient.isConnected()) {
+    if (lostApiClient != null && !lostApiClient.isConnected()) {
       lostApiClient.connect();
     }
-    for (LocationEngineListener listener : locationListeners) {
-      listener.onConnected();
-    }
   }
 
   /**
@@ -59,7 +59,7 @@ public void activate() {
    */
   @Override
   public void deactivate() {
-    if (lostApiClient.isConnected()) {
+    if (lostApiClient != null && lostApiClient.isConnected()) {
       lostApiClient.disconnect();
     }
   }
@@ -76,7 +76,25 @@ public boolean isConnected() {
   }
 
   /**
-   * Returns the Last known location if the location provider is connected and location permissions are granted.
+   * Invoked when the location provider has connected.
+   */
+  @Override
+  public void onConnected() {
+    for (LocationEngineListener listener : locationListeners) {
+      listener.onConnected();
+    }
+  }
+
+  /**
+   * Invoked when the location provider connection has been suspended.
+   */
+  @Override
+  public void onConnectionSuspended() {
+    Log.d(LOG_TAG, "Connection suspended");
+  }
+
+  /**
+   * Returns the Last known location if the location provider is connected.
    *
    * @return the last known location
    */
@@ -85,7 +103,7 @@ public boolean isConnected() {
   public Location getLastLocation() {
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      return LocationServices.FusedLocationApi.getLastLocation();
+      return LocationServices.FusedLocationApi.getLastLocation(lostApiClient);
     }
     return null;
   }
@@ -107,7 +125,6 @@ public void requestLocationUpdates() {
       request.setSmallestDisplacement(smallestDisplacement);
     }
 
-    // Priority matching is straightforward
     if (priority == LocationEnginePriority.NO_POWER) {
       request.setPriority(LocationRequest.PRIORITY_NO_POWER);
     } else if (priority == LocationEnginePriority.LOW_POWER) {
@@ -120,7 +137,7 @@ public void requestLocationUpdates() {
 
     if (lostApiClient.isConnected()) {
       //noinspection MissingPermission
-      LocationServices.FusedLocationApi.requestLocationUpdates(request, this);
+      LocationServices.FusedLocationApi.requestLocationUpdates(lostApiClient, request, this);
     }
   }
 
@@ -130,10 +147,15 @@ public void requestLocationUpdates() {
   @Override
   public void removeLocationUpdates() {
     if (lostApiClient.isConnected()) {
-      LocationServices.FusedLocationApi.removeLocationUpdates(this);
+      LocationServices.FusedLocationApi.removeLocationUpdates(lostApiClient, this);
     }
   }
 
+  @Override
+  public Type obtainType() {
+    return Type.LOST;
+  }
+
   /**
    * Invoked when the Location has changed.
    *
@@ -145,5 +167,4 @@ public void onLocationChanged(Location location) {
       listener.onLocationChanged(location);
     }
   }
-}
-
+}
\ No newline at end of file
diff --git a/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngineFactory.java b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngineFactory.java
new file mode 100644
index 000000000..c7355af84
--- /dev/null
+++ b/mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/location/LostLocationEngineFactory.java
@@ -0,0 +1,24 @@
+package com.mapbox.services.android.telemetry.location;
+
+
+import android.content.Context;
+
+class LostLocationEngineFactory implements LocationEngineSupplier {
+
+  private static final String LOST_LOCATION_SERVICES = "com.mapzen.android.lost.api.LocationServices";
+  private final ClasspathChecker classpathChecker;
+
+  LostLocationEngineFactory(ClasspathChecker classpathChecker) {
+    this.classpathChecker = classpathChecker;
+  }
+
+  @Override
+  public LocationEngine supply(Context context) {
+    return LostLocationEngine.getLocationEngine(context);
+  }
+
+  @Override
+  public boolean hasDependencyOnClasspath() {
+    return classpathChecker.hasDependencyOnClasspath(LOST_LOCATION_SERVICES);
+  }
+}