remove play services first round

222 files changed, 30 insertions, 4102 deletions

diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml
index 372e4b9..f0677b9 100644
--- a/main/AndroidManifest.xml
+++ b/main/AndroidManifest.xml
@@ -41,9 +41,6 @@
         android:label="@string/app_name"
         android:theme="@style/cgeo"
         android:hardwareAccelerated="false">
-        <uses-library
-            android:name="com.google.android.maps"
-            android:required="false" />
 
         <!-- Samsung Multi-Window support -->
         <uses-library
@@ -65,9 +62,6 @@
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIsvD_aUSDMwWOf9NkwwxZ4kJJI_AG2EaxjSu2jw" />
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
 
         <activity
             android:name=".MainActivity"
diff --git a/main/project.properties b/main/project.properties
index 600d70f..2ce3c6d 100644
--- a/main/project.properties
+++ b/main/project.properties
@@ -17,5 +17,3 @@ android.library.reference.2=../android-support-v7-appcompat
 android.library.reference.3=../showcaseview
 java.source=1.7
 java.target=1.7
-android.library.reference.4=../play-services-base
-android.library.reference.5=../play-services-location
diff --git a/main/src/cgeo/geocaching/CgeoApplication.java b/main/src/cgeo/geocaching/CgeoApplication.java
index d74acea..847b520 100644
--- a/main/src/cgeo/geocaching/CgeoApplication.java
+++ b/main/src/cgeo/geocaching/CgeoApplication.java
@@ -6,9 +6,6 @@ import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.OOMDumpingUncaughtExceptionHandler;
 import cgeo.geocaching.utils.RxUtils;
 
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesUtil;
-
 import org.eclipse.jdt.annotation.NonNull;
 
 import android.app.Application;
diff --git a/main/src/cgeo/geocaching/playservices/LocationProvider.java b/main/src/cgeo/geocaching/playservices/LocationProvider.java
deleted file mode 100644
index 027ae29..0000000
--- a/main/src/cgeo/geocaching/playservices/LocationProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package cgeo.geocaching.playservices;
-
-import cgeo.geocaching.sensors.GeoData;
-import cgeo.geocaching.settings.Settings;
-import cgeo.geocaching.utils.Log;
-import cgeo.geocaching.utils.RxUtils;
-
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.location.LocationListener;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationServices;
-
-import rx.Observable;
-import rx.Observable.OnSubscribe;
-import rx.Subscriber;
-import rx.functions.Action0;
-import rx.functions.Func1;
-import rx.observers.Subscribers;
-import rx.subjects.ReplaySubject;
-import rx.subscriptions.Subscriptions;
-
-import android.content.Context;
-import android.location.Location;
-import android.os.Bundle;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class LocationProvider implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
-
-    private static final LocationRequest LOCATION_REQUEST =
-            LocationRequest.create().setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY).setInterval(2000).setFastestInterval(250);
-    private static final LocationRequest LOCATION_REQUEST_LOW_POWER =
-            LocationRequest.create().setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY).setInterval(10000).setFastestInterval(5000);
-    private static final AtomicInteger mostPreciseCount = new AtomicInteger(0);
-    private static final AtomicInteger lowPowerCount = new AtomicInteger(0);
-    private static LocationProvider instance = null;
-    private static final ReplaySubject<GeoData> subject = ReplaySubject.createWithSize(1);
-    private final GoogleApiClient locationClient;
-
-    private static synchronized LocationProvider getInstance(final Context context) {
-        if (instance == null) {
-            instance = new LocationProvider(context);
-        }
-        return instance;
-    }
-
-    private synchronized void updateRequest() {
-        if (locationClient.isConnected()) {
-            if (mostPreciseCount.get() > 0) {
-                Log.d("LocationProvider: requesting most precise locations");
-                LocationServices.FusedLocationApi.requestLocationUpdates(locationClient, LOCATION_REQUEST, this, RxUtils.looperCallbacksLooper);
-            } else if (lowPowerCount.get() > 0) {
-                Log.d("LocationProvider: requesting low-power locations");
-                LocationServices.FusedLocationApi.requestLocationUpdates(locationClient, LOCATION_REQUEST_LOW_POWER, this, RxUtils.looperCallbacksLooper);
-            } else {
-                Log.d("LocationProvider: stopping location requests");
-                LocationServices.FusedLocationApi.removeLocationUpdates(locationClient, this);
-            }
-        }
-    }
-
-    private static Observable<GeoData> get(final Context context, final AtomicInteger reference) {
-        final LocationProvider instance = getInstance(context);
-        return Observable.create(new OnSubscribe<GeoData>() {
-            @Override
-            public void call(final Subscriber<? super GeoData> subscriber) {
-                if (reference.incrementAndGet() == 1) {
-                    instance.updateRequest();
-                }
-                subscriber.add(Subscriptions.create(new Action0() {
-                    @Override
-                    public void call() {
-                        RxUtils.looperCallbacksWorker.schedule(new Action0() {
-                            @Override
-                            public void call() {
-                                if (reference.decrementAndGet() == 0) {
-                                    instance.updateRequest();
-                                }
-                            }
-                        }, 2500, TimeUnit.MILLISECONDS);
-                    }
-                }));
-                subscriber.add(subject.subscribe(Subscribers.from(subscriber)));
-            }
-        });
-    }
-
-    public static Observable<GeoData> getMostPrecise(final Context context) {
-        return get(context, mostPreciseCount).onBackpressureDrop();
-    }
-
-    public static Observable<GeoData> getLowPower(final Context context) {
-        // Low-power location without the last stored location
-        final Observable<GeoData> lowPowerObservable = get(context, lowPowerCount).skip(1);
-
-        // High-power location without the last stored location
-        final Observable<GeoData> highPowerObservable = get(context, mostPreciseCount).skip(1);
-
-        // Use either low-power (with a 6 seconds head start) or high-power observables to obtain a location
-        // no less precise than 20 meters.
-        final Observable<GeoData> untilPreciseEnoughObservable =
-                lowPowerObservable.mergeWith(highPowerObservable.delaySubscription(6, TimeUnit.SECONDS))
-                        .takeUntil(new Func1<GeoData, Boolean>() {
-                            @Override
-                            public Boolean call(final GeoData geoData) {
-                                return geoData.getAccuracy() <= 20;
-                            }
-                        });
-
-        // After sending the last known location, try to get a precise location then use the low-power mode. If no
-        // location information is given for 25 seconds (if the network location is turned off for example), get
-        // back to the precise location and try again.
-        return subject.first().concatWith(untilPreciseEnoughObservable.concatWith(lowPowerObservable).timeout(25, TimeUnit.SECONDS).retry()).onBackpressureDrop();
-    }
-
-    /**
-     * Build a new geo data provider object.
-     * <p/>
-     * There is no need to instantiate more than one such object in an application, as observers can be added
-     * at will.
-     *
-     * @param context the context used to retrieve the system services
-     */
-    private LocationProvider(final Context context) {
-        final GeoData initialLocation = GeoData.getInitialLocation(context);
-        subject.onNext(initialLocation != null ? initialLocation : GeoData.DUMMY_LOCATION);
-        locationClient = new GoogleApiClient.Builder(context)
-                .addApi(LocationServices.API)
-                .addConnectionCallbacks(this)
-                .addOnConnectionFailedListener(this)
-                .build();
-        locationClient.connect();
-    }
-
-    @Override
-    public void onConnected(final Bundle bundle) {
-        updateRequest();
-    }
-
-    @Override
-    public void onConnectionFailed(final ConnectionResult connectionResult) {
-        Log.e("cannot connect to Google Play location service: " + connectionResult);
-        subject.onError(new RuntimeException("Connection failed: " + connectionResult));
-    }
-
-    @Override
-    public void onLocationChanged(final Location location) {
-        if (Settings.useLowPowerMode()) {
-            location.setProvider(GeoData.LOW_POWER_PROVIDER);
-        }
-        subject.onNext(new GeoData(location));
-    }
-
-    @Override
-    public void onConnectionSuspended(final int arg0) {
-        // empty
-    }
-}
diff --git a/main/src/cgeo/geocaching/sensors/Sensors.java b/main/src/cgeo/geocaching/sensors/Sensors.java
index c3f6ce7..6dc0ec2 100644
--- a/main/src/cgeo/geocaching/sensors/Sensors.java
+++ b/main/src/cgeo/geocaching/sensors/Sensors.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching.sensors;
 
 import cgeo.geocaching.CgeoApplication;
-import cgeo.geocaching.playservices.LocationProvider;
 import cgeo.geocaching.sensors.GpsStatusProvider.Status;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.utils.AngleUtils;
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index c15bc1b..3e05efa 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -12,7 +12,7 @@ import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.maps.CGeoMap.MapMode;
 import cgeo.geocaching.maps.MapProviderFactory;
-//import cgeo.geocaching.maps.google.v1.GoogleMapProvider;
+import cgeo.geocaching.maps.LivemapStrategy;
 import cgeo.geocaching.maps.interfaces.GeoPointImpl;
 import cgeo.geocaching.maps.interfaces.MapProvider;
 import cgeo.geocaching.maps.interfaces.MapSource;
@@ -57,7 +57,7 @@ public class Settings {
     private static final char HISTORY_SEPARATOR = ',';
     public static final int SHOW_WP_THRESHOLD_DEFAULT = 10;
     public static final int SHOW_WP_THRESHOLD_MAX = 50;
-//    private static final int MAP_SOURCE_DEFAULT = GoogleMapProvider.GOOGLE_MAP_ID.hashCode();
+    private static final int MAP_SOURCE_DEFAULT = GoogleMapProvider.GOOGLE_MAP_ID.hashCode();
 
     public static final boolean HW_ACCEL_DISABLED_BY_DEFAULT =
             Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1 ||
@@ -136,63 +136,6 @@ public class Settings {
             // migrate from non standard file location and integer based boolean types
             final Editor e = sharedPrefs.edit();
 
-<<<<<<< HEAD
-            e.putString(getKey(R.string.pref_temp_twitter_token_secret), old.getString(getKey(R.string.pref_temp_twitter_token_secret), null));
-            e.putString(getKey(R.string.pref_temp_twitter_token_public), old.getString(getKey(R.string.pref_temp_twitter_token_public), null));
-            e.putBoolean(getKey(R.string.pref_help_shown), old.getInt(getKey(R.string.pref_help_shown), 0) != 0);
-            e.putFloat(getKey(R.string.pref_anylongitude), old.getFloat(getKey(R.string.pref_anylongitude), 0));
-            e.putFloat(getKey(R.string.pref_anylatitude), old.getFloat(getKey(R.string.pref_anylatitude), 0));
-            e.putBoolean(getKey(R.string.pref_offlinemaps), 0 != old.getInt(getKey(R.string.pref_offlinemaps), 1));
-            e.putBoolean(getKey(R.string.pref_offlinewpmaps), 0 != old.getInt(getKey(R.string.pref_offlinewpmaps), 0));
-            e.putString(getKey(R.string.pref_webDeviceCode), old.getString(getKey(R.string.pref_webDeviceCode), null));
-            e.putString(getKey(R.string.pref_webDeviceName), old.getString(getKey(R.string.pref_webDeviceName), null));
-            e.putBoolean(getKey(R.string.pref_maplive), old.getInt(getKey(R.string.pref_maplive), 1) != 0);
-//            e.putInt(getKey(R.string.pref_mapsource), old.getInt(getKey(R.string.pref_mapsource), MAP_SOURCE_DEFAULT));
-            e.putBoolean(getKey(R.string.pref_twitter), 0 != old.getInt(getKey(R.string.pref_twitter), 0));
-            e.putBoolean(getKey(R.string.pref_showaddress), 0 != old.getInt(getKey(R.string.pref_showaddress), 1));
-            e.putBoolean(getKey(R.string.pref_showcaptcha), old.getBoolean(getKey(R.string.pref_showcaptcha), false));
-            e.putBoolean(getKey(R.string.pref_maptrail), old.getInt(getKey(R.string.pref_maptrail), 1) != 0);
-            e.putInt(getKey(R.string.pref_lastmapzoom), old.getInt(getKey(R.string.pref_lastmapzoom), 14));
-            e.putBoolean(getKey(R.string.pref_livelist), 0 != old.getInt(getKey(R.string.pref_livelist), 1));
-            e.putBoolean(getKey(R.string.pref_units), old.getInt(getKey(R.string.pref_units), unitsMetric) == unitsMetric);
-            e.putBoolean(getKey(R.string.pref_skin), old.getInt(getKey(R.string.pref_skin), 0) != 0);
-            e.putInt(getKey(R.string.pref_lastusedlist), old.getInt(getKey(R.string.pref_lastusedlist), StoredList.STANDARD_LIST_ID));
-            e.putString(getKey(R.string.pref_cachetype), old.getString(getKey(R.string.pref_cachetype), CacheType.ALL.id));
-            e.putString(getKey(R.string.pref_twitter_token_secret), old.getString(getKey(R.string.pref_twitter_token_secret), null));
-            e.putString(getKey(R.string.pref_twitter_token_public), old.getString(getKey(R.string.pref_twitter_token_public), null));
-            e.putInt(getKey(R.string.pref_version), old.getInt(getKey(R.string.pref_version), 0));
-            e.putBoolean(getKey(R.string.pref_autoloaddesc), 0 != old.getInt(getKey(R.string.pref_autoloaddesc), 1));
-            e.putBoolean(getKey(R.string.pref_ratingwanted), old.getBoolean(getKey(R.string.pref_ratingwanted), true));
-            e.putBoolean(getKey(R.string.pref_friendlogswanted), old.getBoolean(getKey(R.string.pref_friendlogswanted), true));
-            e.putBoolean(getKey(R.string.pref_useenglish), old.getBoolean(getKey(R.string.pref_useenglish), false));
-            e.putBoolean(getKey(R.string.pref_usecompass), 0 != old.getInt(getKey(R.string.pref_usecompass), 1));
-            e.putBoolean(getKey(R.string.pref_trackautovisit), old.getBoolean(getKey(R.string.pref_trackautovisit), false));
-            e.putBoolean(getKey(R.string.pref_sigautoinsert), old.getBoolean(getKey(R.string.pref_sigautoinsert), false));
-            e.putBoolean(getKey(R.string.pref_logimages), old.getBoolean(getKey(R.string.pref_logimages), false));
-            e.putBoolean(getKey(R.string.pref_excludedisabled), 0 != old.getInt(getKey(R.string.pref_excludedisabled), 0));
-            e.putBoolean(getKey(R.string.pref_excludemine), 0 != old.getInt(getKey(R.string.pref_excludemine), 0));
-            e.putString(getKey(R.string.pref_mapfile), old.getString(getKey(R.string.pref_mapfile), null));
-            e.putString(getKey(R.string.pref_signature), old.getString(getKey(R.string.pref_signature), null));
-            e.putString(getKey(R.string.pref_pass_vote), old.getString(getKey(R.string.pref_pass_vote), null));
-            e.putString(getKey(R.string.pref_password), old.getString(getKey(R.string.pref_password), null));
-            e.putString(getKey(R.string.pref_username), old.getString(getKey(R.string.pref_username), null));
-            e.putString(getKey(R.string.pref_memberstatus), old.getString(getKey(R.string.pref_memberstatus), ""));
-            e.putInt(getKey(R.string.pref_coordinputformat), old.getInt(getKey(R.string.pref_coordinputformat), CoordInputFormatEnum.DEFAULT_INT_VALUE));
-            e.putBoolean(getKey(R.string.pref_log_offline), old.getBoolean(getKey(R.string.pref_log_offline), false));
-            e.putBoolean(getKey(R.string.pref_choose_list), old.getBoolean(getKey(R.string.pref_choose_list), true));
-            e.putBoolean(getKey(R.string.pref_loaddirectionimg), old.getBoolean(getKey(R.string.pref_loaddirectionimg), true));
-            e.putString(getKey(R.string.pref_gccustomdate), old.getString(getKey(R.string.pref_gccustomdate), null));
-            e.putInt(getKey(R.string.pref_showwaypointsthreshold), old.getInt(getKey(R.string.pref_showwaypointsthreshold), SHOW_WP_THRESHOLD_DEFAULT));
-            e.putString(getKey(R.string.pref_cookiestore), old.getString(getKey(R.string.pref_cookiestore), null));
-            e.putBoolean(getKey(R.string.pref_opendetailslastpage), old.getBoolean(getKey(R.string.pref_opendetailslastpage), false));
-            e.putInt(getKey(R.string.pref_lastdetailspage), old.getInt(getKey(R.string.pref_lastdetailspage), 1));
-            e.putInt(getKey(R.string.pref_defaultNavigationTool), old.getInt(getKey(R.string.pref_defaultNavigationTool), NavigationAppsEnum.COMPASS.id));
-            e.putInt(getKey(R.string.pref_defaultNavigationTool2), old.getInt(getKey(R.string.pref_defaultNavigationTool2), NavigationAppsEnum.INTERNAL_MAP.id));
-            e.putInt(getKey(R.string.pref_livemapstrategy), old.getInt(getKey(R.string.pref_livemapstrategy), Strategy.AUTO.id));
-            e.putBoolean(getKey(R.string.pref_debug), old.getBoolean(getKey(R.string.pref_debug), false));
-            e.putBoolean(getKey(R.string.pref_hidelivemaphint), old.getInt(getKey(R.string.pref_hidelivemaphint), 0) != 0);
-            e.putInt(getKey(R.string.pref_livemaphintshowcount), old.getInt(getKey(R.string.pref_livemaphintshowcount), 0));
-=======
             e.putString(getKey(R.string.pref_temp_twitter_token_secret), prefsV0.getString(getKey(R.string.pref_temp_twitter_token_secret), null));
             e.putString(getKey(R.string.pref_temp_twitter_token_public), prefsV0.getString(getKey(R.string.pref_temp_twitter_token_public), null));
             e.putBoolean(getKey(R.string.pref_help_shown), prefsV0.getInt(getKey(R.string.pref_help_shown), 0) != 0);
@@ -247,7 +190,6 @@ public class Settings {
             e.putInt(getKey(R.string.pref_livemapstrategy), prefsV0.getInt(getKey(R.string.pref_livemapstrategy), LivemapStrategy.AUTO.id));
             e.putBoolean(getKey(R.string.pref_debug), prefsV0.getBoolean(getKey(R.string.pref_debug), false));
             e.putInt(getKey(R.string.pref_livemaphintshowcount), prefsV0.getInt(getKey(R.string.pref_livemaphintshowcount), 0));
->>>>>>> 59b8b2e26a7fff6072c4d5d96f51035dc900e0bc
 
             e.putInt(getKey(R.string.pref_settingsversion), 1); // mark migrated
             e.apply();
@@ -269,9 +211,9 @@ public class Settings {
             e.putInt(getKey(R.string.pref_showwaypointsthreshold), wpThreshold);
 
             // KEY_MAP_SOURCE must be string, because it is the key for a ListPreference now
-//            final int ms = sharedPrefs.getInt(getKey(R.string.pref_mapsource), MAP_SOURCE_DEFAULT);
+            final int ms = sharedPrefs.getInt(getKey(R.string.pref_mapsource), MAP_SOURCE_DEFAULT);
             e.remove(getKey(R.string.pref_mapsource));
-//            e.putString(getKey(R.string.pref_mapsource), String.valueOf(ms));
+            e.putString(getKey(R.string.pref_mapsource), String.valueOf(ms));
 
             // navigation tool ids must be string, because ListPreference uses strings as keys
             final int dnt1 = sharedPrefs.getInt(getKey(R.string.pref_defaultNavigationTool), NavigationAppsEnum.COMPASS.id);
@@ -749,8 +691,8 @@ public class Settings {
         if (mapSource != null) {
             return mapSource;
         }
-//        final int id = getConvertedMapId();
-//        mapSource = MapProviderFactory.getMapSource(id);
+        final int id = getConvertedMapId();
+        mapSource = MapProviderFactory.getMapSource(id);
         if (mapSource != null) {
             // don't use offline maps if the map file is not valid
             if (!(mapSource instanceof OfflineMapSource) || isValidMapFile()) {
@@ -774,30 +716,30 @@ public class Settings {
     /**
      * Convert old preference ids for maps (based on constant values) into new hash based ids.
      */
-//    private static int getConvertedMapId() {
-//        final int id = Integer.parseInt(getString(R.string.pref_mapsource,
-//                String.valueOf(MAP_SOURCE_DEFAULT)));
-//        switch (id) {
-//            case GOOGLEMAP_BASEID + MAP:
-//                return GoogleMapProvider.GOOGLE_MAP_ID.hashCode();
-//            case GOOGLEMAP_BASEID + SATELLITE:
-//                return GoogleMapProvider.GOOGLE_SATELLITE_ID.hashCode();
-//            case MFMAP_BASEID + MAPNIK:
-//                return MapsforgeMapProvider.MAPSFORGE_MAPNIK_ID.hashCode();
-//            case MFMAP_BASEID + CYCLEMAP:
-//                return MapsforgeMapProvider.MAPSFORGE_CYCLEMAP_ID.hashCode();
-//            case MFMAP_BASEID + OFFLINE: {
-//                final String mapFile = Settings.getMapFile();
-//                if (StringUtils.isNotEmpty(mapFile)) {
-//                    return mapFile.hashCode();
-//                }
-//                break;
-//            }
-//            default:
-//                break;
-//        }
-//        return id;
-//    }
+    private static int getConvertedMapId() {
+        final int id = Integer.parseInt(getString(R.string.pref_mapsource,
+                String.valueOf(MAP_SOURCE_DEFAULT)));
+        switch (id) {
+            case GOOGLEMAP_BASEID + MAP:
+                return GoogleMapProvider.GOOGLE_MAP_ID.hashCode();
+            case GOOGLEMAP_BASEID + SATELLITE:
+                return GoogleMapProvider.GOOGLE_SATELLITE_ID.hashCode();
+            case MFMAP_BASEID + MAPNIK:
+                return MapsforgeMapProvider.MAPSFORGE_MAPNIK_ID.hashCode();
+            case MFMAP_BASEID + CYCLEMAP:
+                return MapsforgeMapProvider.MAPSFORGE_CYCLEMAP_ID.hashCode();
+            case MFMAP_BASEID + OFFLINE: {
+                final String mapFile = Settings.getMapFile();
+                if (StringUtils.isNotEmpty(mapFile)) {
+                    return mapFile.hashCode();
+                }
+                break;
+            }
+            default:
+                break;
+        }
+        return id;
+    }
 
     public static synchronized void setMapSource(final MapSource newMapSource) {
         putString(R.string.pref_mapsource, String.valueOf(newMapSource.getNumericalId()));
diff --git a/play-services-base/.classpath b/play-services-base/.classpath
deleted file mode 100644
index f8b9238..0000000
--- a/play-services-base/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="gen">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/play-services-base/.project b/play-services-base/.project
deleted file mode 100644
index ac574cb..0000000
--- a/play-services-base/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>play-services-base</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/play-services-base/.settings/org.eclipse.jdt.core.prefs b/play-services-base/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2d..0000000
--- a/play-services-base/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/play-services-base/AndroidManifest.xml b/play-services-base/AndroidManifest.xml
deleted file mode 100644
index 9e129f9..0000000
--- a/play-services-base/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.gms">
-    <uses-sdk android:minSdkVersion="9"/>
-
-    <application>
-        <meta-data
-            android:name="com.google.android.gms.version"
-            android:value="@integer/google_play_services_version" />
-    </application>
-
-</manifest>
diff --git a/play-services-base/build.xml b/play-services-base/build.xml
deleted file mode 100644
index d87d105..0000000
--- a/play-services-base/build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="play_services_base" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-        message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-        unless="sdk.dir" />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/play-services-base/libs/play-services-base.jar b/play-services-base/libs/play-services-base.jar
deleted file mode 100644
index a7666a9..0000000
--- a/play-services-base/libs/play-services-base.jar
+++ /dev/null
diff --git a/play-services-base/lint.xml b/play-services-base/lint.xml
deleted file mode 100644
index 715caf3..0000000
--- a/play-services-base/lint.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <issue id="AaptCrash" severity="ignore" />
-    <issue id="AccidentalOctal" severity="ignore" />
-    <issue id="AdapterViewChildren" severity="ignore" />
-    <issue id="AddJavascriptInterface" severity="ignore" />
-    <issue id="AllowBackup" severity="ignore" />
-    <issue id="AlwaysShowAction" severity="ignore" />
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
-    <issue id="AppCompatMethod" severity="ignore" />
-    <issue id="AppCompatResource" severity="ignore" />
-    <issue id="Assert" severity="ignore" />
-    <issue id="ButtonCase" severity="ignore" />
-    <issue id="ButtonOrder" severity="ignore" />
-    <issue id="ButtonStyle" severity="ignore" />
-    <issue id="ByteOrderMark" severity="ignore" />
-    <issue id="ClickableViewAccessibility" severity="ignore" />
-    <issue id="CommitPrefEdits" severity="ignore" />
-    <issue id="CommitTransaction" severity="ignore" />
-    <issue id="ContentDescription" severity="ignore" />
-    <issue id="CustomViewStyleable" severity="ignore" />
-    <issue id="CutPasteId" severity="ignore" />
-    <issue id="DalvikOverride" severity="ignore" />
-    <issue id="DefaultLocale" severity="ignore" />
-    <issue id="Deprecated" severity="ignore" />
-    <issue id="DeviceAdmin" severity="ignore" />
-    <issue id="DisableBaselineAlignment" severity="ignore" />
-    <issue id="DrawAllocation" severity="ignore" />
-    <issue id="DuplicateActivity" severity="ignore" />
-    <issue id="DuplicateDefinition" severity="ignore" />
-    <issue id="DuplicateIds" severity="ignore" />
-    <issue id="DuplicateIncludedIds" severity="ignore" />
-    <issue id="DuplicateUsesFeature" severity="ignore" />
-    <issue id="EnforceUTF8" severity="ignore" />
-    <issue id="ExportedContentProvider" severity="ignore" />
-    <issue id="ExportedPreferenceActivity" severity="ignore" />
-    <issue id="ExportedReceiver" severity="ignore" />
-    <issue id="ExportedService" severity="ignore" />
-    <issue id="ExtraText" severity="ignore" />
-    <issue id="ExtraTranslation" severity="ignore" />
-    <issue id="FloatMath" severity="ignore" />
-    <issue id="GetInstance" severity="ignore" />
-    <issue id="GifUsage" severity="ignore" />
-    <issue id="GradleCompatible" severity="ignore" />
-    <issue id="GradleDependency" severity="ignore" />
-    <issue id="GradleDeprecated" severity="ignore" />
-    <issue id="GradleDynamicVersion" severity="ignore" />
-    <issue id="GradleGetter" severity="ignore" />
-    <issue id="GradleIdeError" severity="ignore" />
-    <issue id="GradleOverrides" severity="ignore" />
-    <issue id="GradlePath" severity="ignore" />
-    <issue id="GrantAllUris" severity="ignore" />
-    <issue id="GridLayout" severity="ignore" />
-    <issue id="HandlerLeak" severity="ignore" />
-    <issue id="HardcodedDebugMode" severity="ignore" />
-    <issue id="HardcodedText" severity="ignore" />
-    <issue id="IconColors" severity="ignore" />
-    <issue id="IconDensities" severity="ignore" />
-    <issue id="IconDipSize" severity="ignore" />
-    <issue id="IconDuplicates" severity="ignore" />
-    <issue id="IconDuplicatesConfig" severity="ignore" />
-    <issue id="IconExtension" severity="ignore" />
-    <issue id="IconLauncherShape" severity="ignore" />
-    <issue id="IconLocation" severity="ignore" />
-    <issue id="IconMissingDensityFolder" severity="ignore" />
-    <issue id="IconMixedNinePatch" severity="ignore" />
-    <issue id="IconNoDpi" severity="ignore" />
-    <issue id="IconXmlAndPng" severity="ignore" />
-    <issue id="IllegalResourceRef" severity="ignore" />
-    <issue id="ImpliedQuantity" severity="ignore" />
-    <issue id="InOrMmUsage" severity="ignore" />
-    <issue id="IncludeLayoutParam" severity="ignore" />
-    <issue id="InconsistentArrays" severity="ignore" />
-    <issue id="InconsistentLayout" severity="ignore" />
-    <issue id="InefficientWeight" severity="ignore" />
-    <issue id="InflateParams" severity="ignore" />
-    <issue id="InlinedApi" severity="ignore" />
-    <issue id="InnerclassSeparator" severity="ignore" />
-    <issue id="Instantiatable" severity="ignore" />
-    <issue id="InvalidId" severity="ignore" />
-    <issue id="InvalidPackage" severity="ignore" />
-    <issue id="JavascriptInterface" severity="ignore" />
-    <issue id="LabelFor" severity="ignore" />
-    <issue id="LibraryCustomView" severity="ignore" />
-    <issue id="LocalSuppress" severity="ignore" />
-    <issue id="LocaleFolder" severity="ignore" />
-    <issue id="MangledCRLF" severity="ignore" />
-    <issue id="ManifestOrder" severity="ignore" />
-    <issue id="ManifestTypo" severity="ignore" />
-    <issue id="MenuTitle" severity="ignore" />
-    <issue id="MergeRootFrame" severity="ignore" />
-    <issue id="MissingApplicationIcon" severity="ignore" />
-    <issue id="MissingId" severity="ignore" />
-    <issue id="MissingPrefix" severity="ignore" />
-    <issue id="MissingQuantity" severity="ignore" />
-    <issue id="MissingRegistered" severity="ignore" />
-    <issue id="MissingSuperCall" severity="ignore" />
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingVersion" severity="ignore" />
-    <issue id="MockLocation" severity="ignore" />
-    <issue id="MultipleUsesSdk" severity="ignore" />
-    <issue id="NamespaceTypo" severity="ignore" />
-    <issue id="NestedScrolling" severity="ignore" />
-    <issue id="NestedWeights" severity="ignore" />
-    <issue id="NewApi" severity="ignore" />
-    <issue id="NfcTechWhitespace" severity="ignore" />
-    <issue id="NotSibling" severity="ignore" />
-    <issue id="ObsoleteLayoutParam" severity="ignore" />
-    <issue id="OldTargetApi" severity="ignore" />
-    <issue id="OnClick" severity="ignore" />
-    <issue id="Orientation" severity="ignore" />
-    <issue id="Overdraw" severity="ignore" />
-    <issue id="Override" severity="ignore" />
-    <issue id="PackagedPrivateKey" severity="ignore" />
-    <issue id="ParcelCreator" severity="ignore" />
-    <issue id="PrivateResource" severity="ignore" />
-    <issue id="Proguard" severity="ignore" />
-    <issue id="ProguardSplit" severity="ignore" />
-    <issue id="PropertyEscape" severity="ignore" />
-    <issue id="ProtectedPermissions" severity="ignore" />
-    <issue id="PxUsage" severity="ignore" />
-    <issue id="Recycle" severity="ignore" />
-    <issue id="ReferenceType" severity="ignore" />
-    <issue id="Registered" severity="ignore" />
-    <issue id="RequiredSize" severity="ignore" />
-    <issue id="ResAuto" severity="ignore" />
-    <issue id="ResourceAsColor" severity="ignore" />
-    <issue id="ResourceCycle" severity="ignore" />
-    <issue id="ResourceName" severity="ignore" />
-    <issue id="RtlCompat" severity="ignore" />
-    <issue id="RtlEnabled" severity="ignore" />
-    <issue id="RtlHardcoded" severity="ignore" />
-    <issue id="RtlSymmetry" severity="ignore" />
-    <issue id="ScrollViewCount" severity="ignore" />
-    <issue id="ScrollViewSize" severity="ignore" />
-    <issue id="SdCardPath" severity="ignore" />
-    <issue id="SecureRandom" severity="ignore" />
-    <issue id="ServiceCast" severity="ignore" />
-    <issue id="SetJavaScriptEnabled" severity="ignore" />
-    <issue id="ShowToast" severity="ignore" />
-    <issue id="SignatureOrSystemPermissions" severity="ignore" />
-    <issue id="SimpleDateFormat" severity="ignore" />
-    <issue id="SmallSp" severity="ignore" />
-    <issue id="SpUsage" severity="ignore" />
-    <issue id="StateListReachable" severity="ignore" />
-    <issue id="StringFormatCount" severity="ignore" />
-    <issue id="StringFormatInvalid" severity="ignore" />
-    <issue id="StringFormatMatches" severity="ignore" />
-    <issue id="StringShouldBeInt" severity="ignore" />
-    <issue id="Suspicious0dp" severity="ignore" />
-    <issue id="SuspiciousImport" severity="ignore" />
-    <issue id="TextFields" severity="ignore" />
-    <issue id="TextViewEdits" severity="ignore" />
-    <issue id="TooDeepLayout" severity="ignore" />
-    <issue id="TooManyViews" severity="ignore" />
-    <issue id="TrulyRandom" severity="ignore" />
-    <issue id="TypographyDashes" severity="ignore" />
-    <issue id="TypographyEllipsis" severity="ignore" />
-    <issue id="TypographyFractions" severity="ignore" />
-    <issue id="TypographyOther" severity="ignore" />
-    <issue id="Typos" severity="ignore" />
-    <issue id="UniquePermission" severity="ignore" />
-    <issue id="UnknownId" severity="ignore" />
-    <issue id="UnknownIdInLayout" severity="ignore" />
-    <issue id="UnlocalizedSms" severity="ignore" />
-    <issue id="UnusedAttribute" severity="ignore" />
-    <issue id="UnusedNamespace" severity="ignore" />
-    <issue id="UnusedQuantity" severity="ignore" />
-    <issue id="UnusedResources" severity="ignore" />
-    <issue id="UseCheckPermission" severity="ignore" />
-    <issue id="UseCompoundDrawables" severity="ignore" />
-    <issue id="UseSparseArrays" severity="ignore" />
-    <issue id="UseValueOf" severity="ignore" />
-    <issue id="UselessLeaf" severity="ignore" />
-    <issue id="UselessParent" severity="ignore" />
-    <issue id="UsesMinSdkAttributes" severity="ignore" />
-    <issue id="ValidFragment" severity="ignore" />
-    <issue id="ViewConstructor" severity="ignore" />
-    <issue id="ViewHolder" severity="ignore" />
-    <issue id="ViewTag" severity="ignore" />
-    <issue id="Wakelock" severity="ignore" />
-    <issue id="WebViewLayout" severity="ignore" />
-    <issue id="WorldReadableFiles" severity="ignore" />
-    <issue id="WorldWriteableFiles" severity="ignore" />
-    <issue id="WrongCall" severity="ignore" />
-    <issue id="WrongCase" severity="ignore" />
-    <issue id="WrongFolder" severity="ignore" />
-    <issue id="WrongManifestParent" severity="ignore" />
-    <issue id="WrongViewCast" severity="ignore" />
-</lint>
\ No newline at end of file
diff --git a/play-services-base/play-services-base.iml b/play-services-base/play-services-base.iml
deleted file mode 100644
index 3525dde..0000000
--- a/play-services-base/play-services-base.iml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="LIBRARY_PROJECT" value="true" />
-        <option name="UPDATE_PROPERTY_FILES" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" />
-      </library>
-    </orderEntry>
-  </component>
-  <component name="org.twodividedbyzero.idea.findbugs">
-    <option name="_basePreferences">
-      <map>
-        <entry key="property.analysisEffortLevel" value="default" />
-        <entry key="property.analyzeAfterCompile" value="false" />
-        <entry key="property.annotationGutterIconEnabled" value="true" />
-        <entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
-        <entry key="property.annotationTextRangeMarkupEnabled" value="true" />
-        <entry key="property.exportAsHtml" value="true" />
-        <entry key="property.exportAsXml" value="true" />
-        <entry key="property.exportBaseDir" value="" />
-        <entry key="property.exportCreateArchiveDir" value="false" />
-        <entry key="property.exportOpenBrowser" value="true" />
-        <entry key="property.minPriorityToReport" value="Medium" />
-        <entry key="property.runAnalysisInBackground" value="false" />
-        <entry key="property.showHiddenDetectors" value="false" />
-        <entry key="property.toolWindowToFront" value="true" />
-      </map>
-    </option>
-    <option name="_detectors">
-      <map>
-        <entry key="AppendingToAnObjectOutputStream" value="true" />
-        <entry key="AtomicityProblem" value="true" />
-        <entry key="BadAppletConstructor" value="false" />
-        <entry key="BadResultSetAccess" value="true" />
-        <entry key="BadSyntaxForRegularExpression" value="true" />
-        <entry key="BadUseOfReturnValue" value="true" />
-        <entry key="BadlyOverriddenAdapter" value="true" />
-        <entry key="BooleanReturnNull" value="true" />
-        <entry key="BuildInterproceduralCallGraph" value="false" />
-        <entry key="BuildObligationPolicyDatabase" value="true" />
-        <entry key="BuildStringPassthruGraph" value="true" />
-        <entry key="CallToUnsupportedMethod" value="false" />
-        <entry key="CalledMethods" value="true" />
-        <entry key="CheckCalls" value="false" />
-        <entry key="CheckExpectedWarnings" value="false" />
-        <entry key="CheckImmutableAnnotation" value="true" />
-        <entry key="CheckRelaxingNullnessAnnotation" value="true" />
-        <entry key="CheckTypeQualifiers" value="true" />
-        <entry key="CloneIdiom" value="true" />
-        <entry key="ComparatorIdiom" value="true" />
-        <entry key="ConfusedInheritance" value="true" />
-        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
-        <entry key="CrossSiteScripting" value="true" />
-        <entry key="DefaultEncodingDetector" value="true" />
-        <entry key="DoInsideDoPrivileged" value="true" />
-        <entry key="DontCatchIllegalMonitorStateException" value="true" />
-        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
-        <entry key="DontUseEnum" value="true" />
-        <entry key="DroppedException" value="true" />
-        <entry key="DumbMethodInvocations" value="true" />
-        <entry key="DumbMethods" value="true" />
-        <entry key="DuplicateBranches" value="true" />
-        <entry key="EmptyZipFileEntry" value="false" />
-        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
-        <entry key="ExplicitSerialization" value="true" />
-        <entry key="FieldItemSummary" value="true" />
-        <entry key="FinalizerNullsFields" value="true" />
-        <entry key="FindBadCast2" value="true" />
-        <entry key="FindBadForLoop" value="true" />
-        <entry key="FindBugsSummaryStats" value="true" />
-        <entry key="FindCircularDependencies" value="false" />
-        <entry key="FindDeadLocalStores" value="true" />
-        <entry key="FindDoubleCheck" value="true" />
-        <entry key="FindEmptySynchronizedBlock" value="true" />
-        <entry key="FindFieldSelfAssignment" value="true" />
-        <entry key="FindFinalizeInvocations" value="true" />
-        <entry key="FindFloatEquality" value="true" />
-        <entry key="FindFloatMath" value="false" />
-        <entry key="FindHEmismatch" value="true" />
-        <entry key="FindInconsistentSync2" value="true" />
-        <entry key="FindJSR166LockMonitorenter" value="true" />
-        <entry key="FindLocalSelfAssignment2" value="true" />
-        <entry key="FindMaskedFields" value="true" />
-        <entry key="FindMismatchedWaitOrNotify" value="true" />
-        <entry key="FindNakedNotify" value="true" />
-        <entry key="FindNoSideEffectMethods" value="true" />
-        <entry key="FindNonSerializableStoreIntoSession" value="false" />
-        <entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
-        <entry key="FindNonShortCircuit" value="true" />
-        <entry key="FindNullDeref" value="true" />
-        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
-        <entry key="FindOpenStream" value="true" />
-        <entry key="FindPuzzlers" value="true" />
-        <entry key="FindRefComparison" value="true" />
-        <entry key="FindReturnRef" value="true" />
-        <entry key="FindRoughConstants" value="true" />
-        <entry key="FindRunInvocations" value="true" />
-        <entry key="FindSelfComparison" value="true" />
-        <entry key="FindSelfComparison2" value="true" />
-        <entry key="FindSleepWithLockHeld" value="true" />
-        <entry key="FindSpinLoop" value="true" />
-        <entry key="FindSqlInjection" value="true" />
-        <entry key="FindTwoLockWait" value="true" />
-        <entry key="FindUncalledPrivateMethods" value="true" />
-        <entry key="FindUnconditionalWait" value="true" />
-        <entry key="FindUninitializedGet" value="true" />
-        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
-        <entry key="FindUnreleasedLock" value="true" />
-        <entry key="FindUnsatisfiedObligation" value="true" />
-        <entry key="FindUnsyncGet" value="true" />
-        <entry key="FindUseOfNonSerializableValue" value="true" />
-        <entry key="FindUselessControlFlow" value="true" />
-        <entry key="FormatStringChecker" value="true" />
-        <entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
-        <entry key="HugeSharedStringConstants" value="true" />
-        <entry key="IDivResultCastToDouble" value="true" />
-        <entry key="IncompatMask" value="true" />
-        <entry key="InconsistentAnnotations" value="true" />
-        <entry key="InefficientIndexOf" value="true" />
-        <entry key="InefficientInitializationInsideLoop" value="true" />
-        <entry key="InefficientMemberAccess" value="false" />
-        <entry key="InefficientToArray" value="true" />
-        <entry key="InfiniteLoop" value="true" />
-        <entry key="InfiniteRecursiveLoop" value="true" />
-        <entry key="InheritanceUnsafeGetResource" value="true" />
-        <entry key="InitializationChain" value="true" />
-        <entry key="InitializeNonnullFieldsInConstructor" value="true" />
-        <entry key="InstantiateStaticClass" value="true" />
-        <entry key="IntCast2LongAsInstant" value="true" />
-        <entry key="InvalidJUnitTest" value="true" />
-        <entry key="IteratorIdioms" value="true" />
-        <entry key="LazyInit" value="true" />
-        <entry key="LoadOfKnownNullValue" value="true" />
-        <entry key="LostLoggerDueToWeakReference" value="true" />
-        <entry key="MethodReturnCheck" value="true" />
-        <entry key="Methods" value="true" />
-        <entry key="MultithreadedInstanceAccess" value="true" />
-        <entry key="MutableLock" value="true" />
-        <entry key="MutableStaticFields" value="true" />
-        <entry key="Naming" value="true" />
-        <entry key="Noise" value="false" />
-        <entry key="NoiseNullDeref" value="false" />
-        <entry key="NoteAnnotationRetention" value="true" />
-        <entry key="NoteCheckReturnValueAnnotations" value="true" />
-        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
-        <entry key="NoteJCIPAnnotation" value="true" />
-        <entry key="NoteNonNullAnnotations" value="false" />
-        <entry key="NoteNonnullReturnValues" value="false" />
-        <entry key="NoteSuppressedWarnings" value="true" />
-        <entry key="NoteUnconditionalParamDerefs" value="true" />
-        <entry key="NumberConstructor" value="true" />
-        <entry key="OptionalReturnNull" value="true" />
-        <entry key="OverridingEqualsNotSymmetrical" value="true" />
-        <entry key="PreferZeroLengthArrays" value="true" />
-        <entry key="PublicSemaphores" value="false" />
-        <entry key="QuestionableBooleanAssignment" value="true" />
-        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
-        <entry key="ReadReturnShouldBeChecked" value="true" />
-        <entry key="RedundantInterfaces" value="true" />
-        <entry key="ReflectiveClasses" value="true" />
-        <entry key="RepeatedConditionals" value="true" />
-        <entry key="ResolveAllReferences" value="false" />
-        <entry key="RuntimeExceptionCapture" value="true" />
-        <entry key="SerializableIdiom" value="true" />
-        <entry key="StartInConstructor" value="true" />
-        <entry key="StaticCalendarDetector" value="true" />
-        <entry key="StringConcatenation" value="true" />
-        <entry key="SuperfluousInstanceOf" value="true" />
-        <entry key="SuspiciousThreadInterrupted" value="true" />
-        <entry key="SwitchFallthrough" value="true" />
-        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
-        <entry key="SynchronizeAndNullCheckField" value="true" />
-        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
-        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
-        <entry key="TestASM" value="false" />
-        <entry key="TestDataflowAnalysis" value="false" />
-        <entry key="TestingGround" value="false" />
-        <entry key="TestingGround2" value="false" />
-        <entry key="TrainFieldStoreTypes" value="true" />
-        <entry key="TrainLongInstantfParams" value="true" />
-        <entry key="TrainNonNullAnnotations" value="true" />
-        <entry key="TrainUnconditionalDerefParams" value="true" />
-        <entry key="URLProblems" value="true" />
-        <entry key="UncallableMethodOfAnonymousClass" value="true" />
-        <entry key="UnnecessaryMath" value="true" />
-        <entry key="UnreadFields" value="true" />
-        <entry key="UselessSubclassMethod" value="false" />
-        <entry key="VarArgsProblems" value="true" />
-        <entry key="VolatileUsage" value="true" />
-        <entry key="WaitInLoop" value="true" />
-        <entry key="WrongMapIterator" value="true" />
-        <entry key="XMLFactoryBypass" value="true" />
-      </map>
-    </option>
-    <option name="_reportCategories">
-      <map>
-        <entry key="BAD_PRACTICE" value="true" />
-        <entry key="CORRECTNESS" value="true" />
-        <entry key="EXPERIMENTAL" value="true" />
-        <entry key="I18N" value="true" />
-        <entry key="MALICIOUS_CODE" value="true" />
-        <entry key="MT_CORRECTNESS" value="true" />
-        <entry key="PERFORMANCE" value="true" />
-        <entry key="SECURITY" value="true" />
-        <entry key="STYLE" value="true" />
-      </map>
-    </option>
-  </component>
-</module>
\ No newline at end of file
diff --git a/play-services-base/proguard.txt b/play-services-base/proguard.txt
deleted file mode 100644
index 5e03f78..0000000
--- a/play-services-base/proguard.txt
+++ /dev/null
@@ -1,24 +0,0 @@
--keep class * extends java.util.ListResourceBundle {
-    protected Object[][] getContents();
-}
-
-# Keep SafeParcelable value, needed for reflection. This is required to support backwards
-# compatibility of some classes.
--keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
-    public static final *** NULL;
-}
-
-# Keep the names of classes/members we need for client functionality.
--keepnames @com.google.android.gms.common.annotation.KeepName class *
--keepclassmembernames class * {
-    @com.google.android.gms.common.annotation.KeepName *;
-}
-
-# Needed for Parcelable/SafeParcelable Creators to not get stripped
--keepnames class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
-# classes introduced in higher API levels than we use as target
--dontwarn com.google.android.gms.common.SupportErrorDialogFragment
--dontwarn com.google.android.gms.common.api.**
\ No newline at end of file
diff --git a/play-services-base/project.properties b/play-services-base/project.properties
deleted file mode 100644
index 664c438..0000000
--- a/play-services-base/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.txt
-
-# Project target.
-target=Google Inc.:Google APIs:21
-android.library=true
diff --git a/play-services-base/res/color/common_signin_btn_text_dark.xml b/play-services-base/res/color/common_signin_btn_text_dark.xml
deleted file mode 100644
index a615ba2..0000000
--- a/play-services-base/res/color/common_signin_btn_text_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:color="@color/common_signin_btn_dark_text_pressed" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:color="@color/common_signin_btn_dark_text_disabled" />
-    <item
-        android:state_focused="true"
-        android:color="@color/common_signin_btn_dark_text_focused" />
-    <item
-        android:state_enabled="false"
-        android:color="@color/common_signin_btn_dark_text_disabled" />
-    <item
-        android:color="@color/common_signin_btn_dark_text_default" />
-</selector>
diff --git a/play-services-base/res/color/common_signin_btn_text_light.xml b/play-services-base/res/color/common_signin_btn_text_light.xml
deleted file mode 100644
index 6620668..0000000
--- a/play-services-base/res/color/common_signin_btn_text_light.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:color="@color/common_signin_btn_light_text_pressed" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:color="@color/common_signin_btn_light_text_disabled" />
-    <item
-        android:state_focused="true"
-        android:color="@color/common_signin_btn_light_text_focused" />
-    <item
-        android:state_enabled="false"
-        android:color="@color/common_signin_btn_light_text_disabled" />
-    <item
-        android:color="@color/common_signin_btn_light_text_default" />
-</selector>
diff --git a/play-services-base/res/drawable-hdpi/common_full_open_on_phone.png b/play-services-base/res/drawable-hdpi/common_full_open_on_phone.png
deleted file mode 100644
index 89423e0..0000000
--- a/play-services-base/res/drawable-hdpi/common_full_open_on_phone.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_ic_googleplayservices.png b/play-services-base/res/drawable-hdpi/common_ic_googleplayservices.png
deleted file mode 100644
index cd0f751..0000000
--- a/play-services-base/res/drawable-hdpi/common_ic_googleplayservices.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
deleted file mode 100644
index 0f9e791..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
deleted file mode 100644
index 570e432..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
deleted file mode 100644
index 570e432..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
deleted file mode 100644
index 0f9e791..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
deleted file mode 100644
index f507b9f..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
deleted file mode 100644
index d5625e5..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
deleted file mode 100644
index aea3c0d..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
deleted file mode 100644
index 849e89f..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
deleted file mode 100644
index f4ab2f2..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
deleted file mode 100644
index 9fe611d..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_icon_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
deleted file mode 100644
index bbcde39..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
deleted file mode 100644
index 53957b6..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
deleted file mode 100644
index 53957b6..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
deleted file mode 100644
index bbcde39..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
deleted file mode 100644
index 000d12e..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
deleted file mode 100644
index d927940..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
deleted file mode 100644
index 67f263c..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
deleted file mode 100644
index 96324c5..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
deleted file mode 100644
index e450312..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png b/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
deleted file mode 100644
index fb94b77..0000000
--- a/play-services-base/res/drawable-hdpi/common_signin_btn_text_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/ic_plusone_medium_off_client.png b/play-services-base/res/drawable-hdpi/ic_plusone_medium_off_client.png
deleted file mode 100644
index b89b884..0000000
--- a/play-services-base/res/drawable-hdpi/ic_plusone_medium_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/ic_plusone_small_off_client.png b/play-services-base/res/drawable-hdpi/ic_plusone_small_off_client.png
deleted file mode 100644
index 816ec91..0000000
--- a/play-services-base/res/drawable-hdpi/ic_plusone_small_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/ic_plusone_standard_off_client.png b/play-services-base/res/drawable-hdpi/ic_plusone_standard_off_client.png
deleted file mode 100644
index 949ed72..0000000
--- a/play-services-base/res/drawable-hdpi/ic_plusone_standard_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-hdpi/ic_plusone_tall_off_client.png b/play-services-base/res/drawable-hdpi/ic_plusone_tall_off_client.png
deleted file mode 100644
index 306a47c..0000000
--- a/play-services-base/res/drawable-hdpi/ic_plusone_tall_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
deleted file mode 100644
index dddcbeb..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
deleted file mode 100644
index 58b75bd..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
deleted file mode 100644
index 58b75bd..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
deleted file mode 100644
index dddcbeb..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
deleted file mode 100644
index 7d9ed78..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
deleted file mode 100644
index 0ca401d..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
deleted file mode 100644
index f2c3f55..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
deleted file mode 100644
index 83b4fc9..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
deleted file mode 100644
index dd74fe8..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
deleted file mode 100644
index b7dc7aa..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_icon_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
deleted file mode 100644
index efdfe2e..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
deleted file mode 100644
index c7650b0..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
deleted file mode 100644
index c7650b0..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
deleted file mode 100644
index efdfe2e..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
deleted file mode 100644
index 8c76283..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
deleted file mode 100644
index abd26bc..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
deleted file mode 100644
index 28181c3..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
deleted file mode 100644
index 34957fa..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
deleted file mode 100644
index e923ee9..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png b/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
deleted file mode 100644
index 34cf6bb..0000000
--- a/play-services-base/res/drawable-mdpi/common_signin_btn_text_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/ic_plusone_medium_off_client.png b/play-services-base/res/drawable-mdpi/ic_plusone_medium_off_client.png
deleted file mode 100644
index 05a8cb9..0000000
--- a/play-services-base/res/drawable-mdpi/ic_plusone_medium_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/ic_plusone_small_off_client.png b/play-services-base/res/drawable-mdpi/ic_plusone_small_off_client.png
deleted file mode 100644
index 103f364..0000000
--- a/play-services-base/res/drawable-mdpi/ic_plusone_small_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/ic_plusone_standard_off_client.png b/play-services-base/res/drawable-mdpi/ic_plusone_standard_off_client.png
deleted file mode 100644
index 2ea233e..0000000
--- a/play-services-base/res/drawable-mdpi/ic_plusone_standard_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-mdpi/ic_plusone_tall_off_client.png b/play-services-base/res/drawable-mdpi/ic_plusone_tall_off_client.png
deleted file mode 100644
index 417d8ee..0000000
--- a/play-services-base/res/drawable-mdpi/ic_plusone_tall_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-tvdpi/ic_plusone_medium_off_client.png b/play-services-base/res/drawable-tvdpi/ic_plusone_medium_off_client.png
deleted file mode 100644
index be47840..0000000
--- a/play-services-base/res/drawable-tvdpi/ic_plusone_medium_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-tvdpi/ic_plusone_small_off_client.png b/play-services-base/res/drawable-tvdpi/ic_plusone_small_off_client.png
deleted file mode 100644
index f629f40..0000000
--- a/play-services-base/res/drawable-tvdpi/ic_plusone_small_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-tvdpi/ic_plusone_standard_off_client.png b/play-services-base/res/drawable-tvdpi/ic_plusone_standard_off_client.png
deleted file mode 100644
index a4f50f1..0000000
--- a/play-services-base/res/drawable-tvdpi/ic_plusone_standard_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-tvdpi/ic_plusone_tall_off_client.png b/play-services-base/res/drawable-tvdpi/ic_plusone_tall_off_client.png
deleted file mode 100644
index e81f7c5..0000000
--- a/play-services-base/res/drawable-tvdpi/ic_plusone_tall_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
deleted file mode 100644
index 9044a11..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
deleted file mode 100644
index e94a49b..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
deleted file mode 100644
index e94a49b..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
deleted file mode 100644
index 9044a11..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
deleted file mode 100644
index bfe4f04..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
deleted file mode 100644
index 876884f..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
deleted file mode 100644
index b3e6dd5..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
deleted file mode 100644
index 5a888f2..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
deleted file mode 100644
index d0f7b4c..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
deleted file mode 100644
index 0db6b06..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_icon_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
deleted file mode 100644
index d182b5e..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
deleted file mode 100644
index 47e2aea..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
deleted file mode 100644
index 47e2aea..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
deleted file mode 100644
index d182b5e..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
deleted file mode 100644
index 64e9706..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
deleted file mode 100644
index 0fd8cdd..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
deleted file mode 100644
index 3427b47..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
deleted file mode 100644
index 31e38c4..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
deleted file mode 100644
index e6a7880..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png b/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
deleted file mode 100644
index 972962d..0000000
--- a/play-services-base/res/drawable-xhdpi/common_signin_btn_text_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/ic_plusone_medium_off_client.png b/play-services-base/res/drawable-xhdpi/ic_plusone_medium_off_client.png
deleted file mode 100644
index 7ce2f8a..0000000
--- a/play-services-base/res/drawable-xhdpi/ic_plusone_medium_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/ic_plusone_small_off_client.png b/play-services-base/res/drawable-xhdpi/ic_plusone_small_off_client.png
deleted file mode 100644
index 568305f..0000000
--- a/play-services-base/res/drawable-xhdpi/ic_plusone_small_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/ic_plusone_standard_off_client.png b/play-services-base/res/drawable-xhdpi/ic_plusone_standard_off_client.png
deleted file mode 100644
index 13b2ed5..0000000
--- a/play-services-base/res/drawable-xhdpi/ic_plusone_standard_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xhdpi/ic_plusone_tall_off_client.png b/play-services-base/res/drawable-xhdpi/ic_plusone_tall_off_client.png
deleted file mode 100644
index c8eb4b8..0000000
--- a/play-services-base/res/drawable-xhdpi/ic_plusone_tall_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
deleted file mode 100644
index c97f349..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
deleted file mode 100644
index 34cbff1..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
deleted file mode 100644
index 34cbff1..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
deleted file mode 100644
index c97f349..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
deleted file mode 100644
index 702c49b..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
deleted file mode 100644
index 06ad5a5..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
deleted file mode 100644
index af160fc..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
deleted file mode 100644
index c647fb4..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
deleted file mode 100644
index fd0a431..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
deleted file mode 100644
index f8ce5a6..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_icon_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
deleted file mode 100644
index b491f62..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
deleted file mode 100644
index 777c8d6..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
deleted file mode 100644
index 777c8d6..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
deleted file mode 100644
index b491f62..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_disabled_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
deleted file mode 100644
index c8a8f1c..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
deleted file mode 100644
index bcd0d0c..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_focus_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
deleted file mode 100644
index ac75dad..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
deleted file mode 100644
index c19afad..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_normal_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
deleted file mode 100644
index c490441..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_dark.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png b/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
deleted file mode 100644
index c52be74..0000000
--- a/play-services-base/res/drawable-xxhdpi/common_signin_btn_text_pressed_light.9.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/ic_plusone_medium_off_client.png b/play-services-base/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
deleted file mode 100644
index 210fb4a..0000000
--- a/play-services-base/res/drawable-xxhdpi/ic_plusone_medium_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/ic_plusone_small_off_client.png b/play-services-base/res/drawable-xxhdpi/ic_plusone_small_off_client.png
deleted file mode 100644
index 71855ad..0000000
--- a/play-services-base/res/drawable-xxhdpi/ic_plusone_small_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/ic_plusone_standard_off_client.png b/play-services-base/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
deleted file mode 100644
index ff43fbe..0000000
--- a/play-services-base/res/drawable-xxhdpi/ic_plusone_standard_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable-xxhdpi/ic_plusone_tall_off_client.png b/play-services-base/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
deleted file mode 100644
index 1bb932a..0000000
--- a/play-services-base/res/drawable-xxhdpi/ic_plusone_tall_off_client.png
+++ /dev/null
diff --git a/play-services-base/res/drawable/common_signin_btn_icon_dark.xml b/play-services-base/res/drawable/common_signin_btn_icon_dark.xml
deleted file mode 100644
index dd1cf67..0000000
--- a/play-services-base/res/drawable/common_signin_btn_icon_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/common_signin_btn_icon_pressed_dark" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_icon_disabled_focus_dark" />
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_icon_focus_dark" />
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/common_signin_btn_icon_disabled_dark" />
-    <item
-        android:drawable="@drawable/common_signin_btn_icon_normal_dark" />
-</selector>
diff --git a/play-services-base/res/drawable/common_signin_btn_icon_light.xml b/play-services-base/res/drawable/common_signin_btn_icon_light.xml
deleted file mode 100644
index abf412b..0000000
--- a/play-services-base/res/drawable/common_signin_btn_icon_light.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/common_signin_btn_icon_pressed_light" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_icon_disabled_focus_light" />
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_icon_focus_light" />
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/common_signin_btn_icon_disabled_light" />
-    <item
-        android:drawable="@drawable/common_signin_btn_icon_normal_light" />
-</selector>
diff --git a/play-services-base/res/drawable/common_signin_btn_text_dark.xml b/play-services-base/res/drawable/common_signin_btn_text_dark.xml
deleted file mode 100644
index 2d92217..0000000
--- a/play-services-base/res/drawable/common_signin_btn_text_dark.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/common_signin_btn_text_pressed_dark" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_text_disabled_focus_dark" />
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_text_focus_dark" />
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/common_signin_btn_text_disabled_dark" />
-    <item
-        android:drawable="@drawable/common_signin_btn_text_normal_dark" />
-</selector>
diff --git a/play-services-base/res/drawable/common_signin_btn_text_light.xml b/play-services-base/res/drawable/common_signin_btn_text_light.xml
deleted file mode 100644
index 810c021..0000000
--- a/play-services-base/res/drawable/common_signin_btn_text_light.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:drawable="@drawable/common_signin_btn_text_pressed_light" />
-    <item
-        android:state_enabled="false"
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_text_disabled_focus_light" />
-    <item
-        android:state_focused="true"
-        android:drawable="@drawable/common_signin_btn_text_focus_light" />
-    <item
-        android:state_enabled="false"
-        android:drawable="@drawable/common_signin_btn_text_disabled_light" />
-    <item
-        android:drawable="@drawable/common_signin_btn_text_normal_light" />
-</selector>
diff --git a/play-services-base/res/raw/gtm_analytics b/play-services-base/res/raw/gtm_analytics
deleted file mode 100644
index c9f49be..0000000
--- a/play-services-base/res/raw/gtm_analytics
+++ /dev/null
diff --git a/play-services-base/res/values-af/common_strings.xml b/play-services-base/res/values-af/common_strings.xml
deleted file mode 100644
index 66766e0..0000000
--- a/play-services-base/res/values-af/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play Services-fout"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"\'n Program vereis dat Google Play Services geïnstalleer word."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"\'n Program vereis dat Google Play Services opgedateer word."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"\'n Program vereis \'n opdatering na die Android Wear-program."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"\'n Program vereis dat Google Play Services geaktiveer word."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Versoek deur <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Kry Google Play-dienste"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou foon is nie."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Hierdie program sal nie loop sonder Google Play-dienste nie, wat nie op jou tablet is nie."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Kry Google Play-dienste"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktiveer Google Play-dienste"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Hierdie program sal nie werk tensy jy Google Play-dienste aktiveer nie."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktiveer Google Play-dienste"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Dateer Google Play-dienste op"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Dateer Android Wear op"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Hierdie program sal nie loop nie, tensy jy Google Play-dienste opdateer."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Hierdie program sal nie werk tensy jy die Android Wear-program opdateer nie."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Netwerkfout"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"\'n Dataverbinding is nodig om aan Google Play-dienste te koppel."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ongeldige rekening"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Die gespesifiseerde rekening bestaan nie op hierdie toestel nie. Kies asseblief \'n ander rekening."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Onbekende probleem met Google Play-dienste."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-dienste"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play-dienste, waarop sommige van jou programme staatmaak, werk nie met jou toestel nie. Kontak asseblief die vervaardiger vir bystand."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Dateer op"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Meld aan"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Meld aan met Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Maak op foon oop"</string>
-</resources>
diff --git a/play-services-base/res/values-am/common_strings.xml b/play-services-base/res/values-am/common_strings.xml
deleted file mode 100644
index abaae9f..0000000
--- a/play-services-base/res/values-am/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"የGoogle Play አገልግሎቶች ስህተት"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲጫኑ ይፈልጋል።"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲዘምኑ ይፈልጋል።"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"አንድ መተግበሪያ የAndroid Wear መተግበሪያ ዝማኔ ያስፈልገዋል።"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"አንድ መተግበሪያ የGoogle Play አገልግሎቶች እንዲነቁ ይፈልጋል።"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"በ<xliff:g id="APP_NAME">%1$s</xliff:g> የተጠየቀ"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play አገልግሎቶችን አግኝ"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ስልክዎ ላይ የሉም።"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ይህ መተግበሪያ ያለ Google Play አገልግሎቶች አይሰራም፣ እነሱ ደግሞ ጡባዊዎ ላይ የሉም።"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play አገልግሎቶችን አግኝ"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play አገልግሎቶችን አንቃ"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Google Play አገልግሎቶችን እስካላነቁ ድረስ ይህ መተግበሪያ አይሰራም።"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play አገልግሎቶችን አንቃ"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play አገልግሎቶችን ያዘምኑ"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wearን ያዘምኑ"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Google Play አገልግሎቶችን እስኪያዘምኑ ድረስ ይህ መተግበሪያ አይሰራም።"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"የAndroid Wear መተግበሪያውን እስኪያዘምኑት ድረስ ይህ መተግበሪያ አያሄድም።"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"የአውታረ መረብ ስህተት"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"ከGoogle Play አገልግሎቶች ጋር ለመገናኘት የውሂብ ግንኙነት ያስፈልጋል።"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"ልክ ያልሆነ መለያ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"የተገለጸው መለያ በዚህ መሣሪያ ላይ የለም። እባክው የተለየ መለያ ይምረጡ።"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"በGoogle Play አገልግሎቶች ላይ ያልታወቀ ችግር።"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play አገልግሎቶች"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"የGoogle Play አገልግሎቶች፣ አንዳንድ መተግበሪያዎችዎ በእሱ ላይ ጥገኛ የሆኑት፣ በመሣሪያዎ አይደገፍም። እባክዎ ለእርዳታ አምራቹን ያግኙ።"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"ያዘምኑ"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ግባ"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"በGoogle ይግቡ"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ስልክ ላይ ክፈት"</string>
-</resources>
diff --git a/play-services-base/res/values-ar/common_strings.xml b/play-services-base/res/values-ar/common_strings.xml
deleted file mode 100644
index b11c84c..0000000
--- a/play-services-base/res/values-ar/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"‏خطأ في خدمات Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"‏يتطلب أحد التطبيقات تثبيت خدمات Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"‏يتطلب أحد التطبيقات تحديث خدمات Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"‏يتطلب أحد التطبيقات تحديثًا لتطبيق Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"‏يتطلب أحد التطبيقات تمكين خدمات Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"تم الطلب عن طريق <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"‏الحصول على خدمات Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"‏لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في هاتفك."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"‏لن يتم تشغيل هذا التطبيق بدون خدمات Google Play، والتي لا تتوفر في جهازك اللوحي."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"‏الحصول على خدمات Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"‏تمكين خدمات Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"‏لن يعمل هذا التطبيق ما لم يتم تمكين خدمات Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"‏تمكين خدمات Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"‏تحديث خدمات Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"‏تحديث Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"‏لن يتم تشغيل هذا التطبيق ما لم تحدِّث خدمات Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"‏لن يتم تشغيل هذا التطبيق ما لم تحدِّث تطبيق Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"خطأ في الشبكة"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"‏يتطلب الاتصال بخدمات Google Play وجود اتصال بيانات."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"حساب غير صالح"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"الحساب الذي تمّ تحديده غير موجود على الجهاز. يُرجى اختيار حساب آخر."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"‏حدثت مشكلة غير معروفة في خدمات Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"‏خدمات Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"‏خدمات Google Play التي تستجيب لها بعض تطبيقاتك لا تعمل على جهازك. يُرجى الاتصال بجهة التصنيع للحصول على المساعدة."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"تحديث"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"تسجيل الدخول"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"‏تسجيل الدخول باستخدام Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"فتح على الهاتف"</string>
-</resources>
diff --git a/play-services-base/res/values-bg/common_strings.xml b/play-services-base/res/values-bg/common_strings.xml
deleted file mode 100644
index 93d4469..0000000
--- a/play-services-base/res/values-bg/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Грешка в услугите за Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Приложение изисква инсталирането на услугите за Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Приложение изисква актуализирането на услугите за Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Приложение изисква актуализиране на Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Приложение изисква активирането на услугите за Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Заявено от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Изтегляне на услугите за Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Това приложение няма да се изпълнява без услугите за Google Play, които липсват в телефона ви."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Това приложение няма да се изпълнява без услугите за Google Play, които липсват в таблета ви."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Услуги за Google Play: Изтегл."</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Активиране на услугите за Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Това приложение няма да работи, освен ако не активирате услугите за Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Услуги за Google Play: Актив."</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Актуализиране на услугите за Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Актуализиране на Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Това приложение няма да се изпълнява, освен ако не актуализирате услугите за Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Това приложение няма да стартира, освен ако не актуализирате Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Грешка в мрежата"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"За свързване с услугите за Google Play се изисква връзка за данни."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Невалиден профил"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Посоченият профил не съществува на това устройство. Моля, изберете друг."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Неизвестен проблем с услугите за Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Услуги за Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Услугите за Google Play, на които разчитат някои от приложенията ви, не се поддържат от устройството ви. Моля, свържете се с производителя за помощ."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Актуализиране"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Вход"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Вход с Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Отваряне в телефона"</string>
-</resources>
diff --git a/play-services-base/res/values-bn-rBD/common_strings.xml b/play-services-base/res/values-bn-rBD/common_strings.xml
deleted file mode 100644
index 90437c6..0000000
--- a/play-services-base/res/values-bn-rBD/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google প্লে পরিষেবার ত্রুটি"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"একটি অ্যাপ্লিকেশানের জন্য Google প্লে পরিষেবার ইনস্টল করা প্রয়োজন৷"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"একটি অ্যাপ্লিকেশানের জন্য Google প্লে পরিষেবার একটি আপডেটের প্রয়োজন৷"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"একটি অ্যাপ্লিকেশানের জন্য Android Wear অ্যাপ্লিকেশানটির একটি আপডেট প্রয়োজন।"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"একটি অ্যাপ্লিকেশানের জন্য Google প্লে পরিষেবা সক্ষম করা প্রয়োজন৷"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> দ্বারা অনুরোধ করা হয়েছে"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google প্লে পরিষেবা পান"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Google প্লে পরিষেবা ছাড়া এই অ্যাপ্লিকেশানটি চলবে না, যেটি আপনার ফোনে অনুপস্থিত৷"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Google প্লে পরিষেবা ছাড়া এই অ্যাপ্লিকেশানটি চলবে না, যেটি আপনার ট্যাবলেটে অনুপস্থিত৷"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google প্লে পরিষেবা পান"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google প্লে পরিষেবা সক্ষম করুন"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"আপনি যতক্ষণ  না Google প্লে পরিষেবা সক্ষম করবেন ততক্ষণ এই অ্যাপ্লিকেশানটি চলবে না৷"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google প্লে পরিষেবা সক্ষম করুন"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google প্লে পরিষেবা আপডেট করুন"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear আপডেট করুন"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"আপনি যতক্ষণ না Google প্লে পরিষেবা আপডেট ততক্ষণ এই অ্যাপ্লিকেশানটি চলবে না৷"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"আপনি Android Wear অ্যাপ্লিকেশান আপডেট না করা পর্যন্ত এই অ্যাপ্লিকেশানটি চলবে না।"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"নেটওয়ার্ক ত্রুটি"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google প্লে পরিষেবা সংযোগ করতে একটি ডেটা সংযোগের প্রয়োজন৷"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"অবৈধ অ্যাকাউন্ট"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"নির্দিষ্ট করা অ্যাকাউন্টটি ডিভাইসে বিদ্যমান নেই৷ দয়া করে একটি ভিন্ন অ্যাকাউন্ট চয়ন করুন৷"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google প্লে পরিষেবার সঙ্গে অজানা সমস্যা৷"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google প্লে পরিষেবা"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google প্লে পরিষেবা, যার উপর আপনার কিছু অ্যাপ্লিকেশান নির্ভর করে, আপনার ডিভাইসে সমর্থিত নয়৷ দয়া করে সহায়তার জন্য প্রস্তুতকারকের সাথে যোগাযোগ করুন৷"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"আপডেট করুন"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"সাইন ইন করুন"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google এর মাধ্যমে সাইন ইন করুন"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ফোনে খুলুন"</string>
-</resources>
diff --git a/play-services-base/res/values-ca/common_strings.xml b/play-services-base/res/values-ca/common_strings.xml
deleted file mode 100644
index 5b573aa..0000000
--- a/play-services-base/res/values-ca/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Error dels serveis de Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Una aplicació requereix que s\'instal·lin els serveis de Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Una aplicació requereix que s\'actualitzin els serveis de Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Una aplicació necessita que s\'actualitzi l\'aplicació Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Una aplicació requereix que s\'activin els serveis de Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Sol·licitada per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Baixa els serveis de Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Aquesta aplicació no s\'executarà si el telèfon no té instal·lats els serveis de  Google Play."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Aquesta aplicació no funcionarà si la tauleta no té instal·lats els serveis de Google Play."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Baixa els serveis de Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activa els serveis de Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Aquesta aplicació no funcionarà si no actives els serveis de Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activa els serveis de Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Actualitza els serveis de Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Actualitza Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Aquesta aplicació no s\'executarà si no actualitzes els serveis de Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Aquesta aplicació no s\'executarà fins que no actualitzis l\'aplicació Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Error de xarxa"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Es requereix una connexió de dades per connectar amb els serveis de Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Compte no vàlid"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"El compte especificat no existeix en aquest dispositiu. Tria un compte diferent."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Error desconegut relacionat amb els serveis de Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Serveis de Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"El teu dispositiu no és compatible amb els serveis de Google Play, en què es basen les teves aplicacions. Per obtenir assistència, contacta amb el fabricant."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Actualitza"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Inicia sessió"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Inicia sessió amb Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Obre al telèfon"</string>
-</resources>
diff --git a/play-services-base/res/values-cs/common_strings.xml b/play-services-base/res/values-cs/common_strings.xml
deleted file mode 100644
index 2122219..0000000
--- a/play-services-base/res/values-cs/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Chyba služeb Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikace vyžaduje instalaci služeb Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikace vyžaduje aktualizaci služeb Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Některá aplikace vyžaduje aktualizaci aplikace Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikace vyžaduje aktivaci služeb Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Požadováno aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Instalovat služby Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ke spuštění této aplikace jsou potřeba služby Google Play, které v telefonu nemáte."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ke spuštění této aplikace jsou potřeba služby Google Play, které v tabletu nemáte."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Instalovat služby Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktivovat služby Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ke spuštění této aplikace je třeba aktivovat služby Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktivovat služby Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Aktualizace služeb Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Aktualizujte aplikaci Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ke spuštění této aplikace je třeba aktualizovat služby Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Aplikace bude fungovat po aktualizaci aplikace Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Chyba sítě"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Připojení ke službám Google Play vyžaduje datové připojení."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Neplatný účet"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Zadaný účet v tomto zařízení neexistuje. Zvolte prosím jiný účet."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Nastal neznámý problém se službami Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Služby Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Některé vaše aplikace vyžadují služby Google Play, které ve vašem zařízení nejsou podporovány. S žádostí o pomoc se prosím obraťte na výrobce."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Aktualizovat"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Přihlásit se"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Přihlásit se účtem Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Otevřít v telefonu"</string>
-</resources>
diff --git a/play-services-base/res/values-da/common_strings.xml b/play-services-base/res/values-da/common_strings.xml
deleted file mode 100644
index a3a7c3e..0000000
--- a/play-services-base/res/values-da/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Fejl i Google Play-tjenester"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"En applikation kræver, at Google Play-tjenester installeres."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"En applikation kræver, at Google Play-tjenester opdateres."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"En applikation kræver en opdatering af appen Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"En applikation kræver, at Google Play-tjenester aktiveres."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Anmodning fra <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Hent Google Play-tjenester"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Denne app kan ikke køre uden Google Play-tjenester, som mangler på din telefon."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Denne app kan ikke køre uden Google Play-tjenester, som mangler på din tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Hent Google Play-tjenester"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktivér Google Play-tjenester"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Denne app virker ikke, medmindre du aktiverer Google Play-tjenester."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktivér Google Play-tjenester"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Opdater Google Play-tjenester"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Opdater Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Denne app kan ikke køre, medmindre du opdaterer Google Play-tjenester."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Denne app kan ikke køre, medmindre du opdaterer appen Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Netværksfejl"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Der kræves en dataforbindelse for at oprette forbindelse til Google Play-tjenester."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ugyldig konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Den angivne konto findes ikke på denne enhed. Vælg en anden konto."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Ukendt problem med Google Play-tjenester."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-tjenester"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play-tjenester, som nogle af dine applikationer er afhængige af, understøttes ikke af din enhed. Kontakt producenten for at få hjælp."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Opdater"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Log ind"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Log ind med Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Åbn på telefonen"</string>
-</resources>
diff --git a/play-services-base/res/values-de/common_strings.xml b/play-services-base/res/values-de/common_strings.xml
deleted file mode 100644
index 3f05262..0000000
--- a/play-services-base/res/values-de/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Fehler bei Zugriff auf Google Play-Dienste"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"App erfordert die Installation der Google Play-Dienste"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"App erfordert ein Update der Google Play-Dienste"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Für eine App ist die Aktualisierung der Android Wear App erforderlich."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"App erfordert die Aktivierung der Google Play-Dienste"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Angefordert von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play-Dienste installieren"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Telefon nicht installiert sind."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Zur Nutzung dieser App sind Google Play-Dienste erforderlich, die auf Ihrem Tablet nicht installiert sind."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play-Dienste installieren"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play-Dienste aktivieren"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Diese App funktioniert nur, wenn Sie die Google Play-Dienste aktivieren."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play-Dienste aktivieren"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play-Dienste aktualisieren"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear aktualisieren"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Diese App wird nur ausgeführt, wenn Sie die Google Play-Dienste aktualisieren."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Diese App funktioniert erst nach der Aktualisierung der Android Wear App."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Netzwerkfehler"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Um eine Verbindung zu den Google Play-Diensten herzustellen, ist eine Datenverbindung erforderlich."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ungültiges Konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Das angegebene Konto ist auf diesem Gerät nicht vorhanden. Bitte wählen Sie ein anderes Konto aus."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Unbekanntes Problem mit Google Play-Diensten"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-Dienste"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play-Dienste, auf denen einige Ihrer Apps basieren, werden von diesem Gerät nicht unterstützt. Wenden Sie sich für weitere Informationen an den Hersteller."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Aktualisieren"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Anmelden"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Über Google anmelden"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Auf Telefon öffnen"</string>
-</resources>
diff --git a/play-services-base/res/values-el/common_strings.xml b/play-services-base/res/values-el/common_strings.xml
deleted file mode 100644
index 765d0cf..0000000
--- a/play-services-base/res/values-el/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Σφάλμα Υπηρεσιών Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Μια εφαρμογή απαιτεί την εγκατάσταση των Υπηρεσιών Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Μια εφαρμογή απαιτεί την ενημέρωση των Υπηρεσιών Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Μια εφαρμογή απαιτεί την ενημέρωση της εφαρμογής Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Μια εφαρμογή απαιτεί την ενεργοποίηση των Υπηρεσιών Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Υποβλήθηκε αίτημα από την εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Λήψη υπηρεσιών Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το τηλέφωνό σας."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Αυτή η εφαρμογή δεν θα εκτελεστεί χωρίς τις υπηρεσίες Google Play, οι οποίες λείπουν από το tablet σας."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Λήψη υπηρεσιών Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Ενεργοποίηση υπηρεσιών Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Αυτή η εφαρμογή δεν θα λειτουργήσει εάν δεν έχετε ενεργοποιήσει τις υπηρεσίες Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Ενεργοπ. υπηρεσιών Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Ενημέρωση υπηρεσιών Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Ενημέρωση Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Αυτή η εφαρμογή θα εκτελεστεί αφού ενημερώσετε τις υπηρεσίες Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Αυτή η εφαρμογή δεν θα εκτελεστεί εάν δεν ενημερώσετε την εφαρμογή Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Σφάλμα δικτύου"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Απαιτείται σύνδεση δεδομένων για να συνδεθείτε με τις Υπηρεσίες Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Μη έγκυρος λογαριασμός"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Ο συγκεκριμένος λογαριασμός δεν υπάρχει σε αυτήν τη συσκευή. Επιλέξτε έναν διαφορετικό λογαριασμό."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Άγνωστο πρόβλημα με τις υπηρεσίες Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Υπηρεσίες Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Οι υπηρεσίες Google Play, στις οποίες βασίζονται ορισμένες από τις εφαρμογές σας, δεν υποστηρίζονται στη συσκευή σας. Επικοινωνήστε με τον κατασκευαστή για υποστήριξη."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Ενημέρωση"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Σύνδεση"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Συνδεθείτε στο Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Άνοιγμα στο τηλέφωνο"</string>
-</resources>
diff --git a/play-services-base/res/values-en-rGB/common_strings.xml b/play-services-base/res/values-en-rGB/common_strings.xml
deleted file mode 100644
index 6beb096..0000000
--- a/play-services-base/res/values-en-rGB/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play services error"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"An application requires installation of Google Play services."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"An application requires an update for Google Play Services."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"An application requires an update to the Android Wear app."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"An application requires Google Play services to be enabled."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Requested by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Get Google Play services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"This app won\'t run without Google Play services, which are missing from your phone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"This app won\'t run without Google Play services, which are missing from your tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Get Google Play services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Enable Google Play services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"This app won\'t work unless you enable Google Play services."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Enable Google Play services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Update Google Play services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Update Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"This app won\'t run unless you update Google Play services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"This app won\'t run unless you update the Android Wear app."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Network Error"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"A data connection is required to connect to Google Play services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Invalid Account"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"The specified account does not exist on this device. Please choose a different account."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Unknown issue with Google Play services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Update"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Sign in"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Sign in with Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Open on phone"</string>
-</resources>
diff --git a/play-services-base/res/values-en-rIN/common_strings.xml b/play-services-base/res/values-en-rIN/common_strings.xml
deleted file mode 100644
index 6beb096..0000000
--- a/play-services-base/res/values-en-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play services error"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"An application requires installation of Google Play services."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"An application requires an update for Google Play Services."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"An application requires an update to the Android Wear app."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"An application requires Google Play services to be enabled."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Requested by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Get Google Play services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"This app won\'t run without Google Play services, which are missing from your phone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"This app won\'t run without Google Play services, which are missing from your tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Get Google Play services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Enable Google Play services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"This app won\'t work unless you enable Google Play services."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Enable Google Play services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Update Google Play services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Update Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"This app won\'t run unless you update Google Play services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"This app won\'t run unless you update the Android Wear app."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Network Error"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"A data connection is required to connect to Google Play services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Invalid Account"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"The specified account does not exist on this device. Please choose a different account."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Unknown issue with Google Play services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Update"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Sign in"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Sign in with Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Open on phone"</string>
-</resources>
diff --git a/play-services-base/res/values-es-rUS/common_strings.xml b/play-services-base/res/values-es-rUS/common_strings.xml
deleted file mode 100644
index 853d4f2..0000000
--- a/play-services-base/res/values-es-rUS/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Error de Google Play Services"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Una aplicación requiere que se instale Google Play Services"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Una aplicación requiere que se actualice Google Play Services"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Hay una aplicación que requiere una actualización para la aplicación Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Una aplicación requiere que se habilite Google Play Services"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitada por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Obtener Google Play Services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Esta aplicación no se ejecutará si no instalasGoogle Play Services en tu dispositivo."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Esta aplicación no se ejecutará si no instalas Google Play Services en tu tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Descargar Google Play Services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activar Google Play Services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Esta aplicación no funcionará si no activas Google Play Services."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activar Google Play Services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Actualizar Google Play Services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Actualizar Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Esta aplicación no se ejecutará si no actualizas Google Play Services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Esta aplicación no se ejecutará, a menos que actualices la aplicación Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Error de red"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Se necesita una conexión de datos para establecer conexión con Google Play Services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Cuenta no válida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"La cuenta especificada no existe en este dispositivo. Elige otra cuenta."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Error desconocido relacionado con Google Play Services"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play Services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play Services, del cual dependen algunas de tus aplicaciones, no es compatible con tu dispositivo. Comunícate con el fabricante para obtener ayuda."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Actualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Acceder"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Acceder con Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir en el teléfono"</string>
-</resources>
diff --git a/play-services-base/res/values-es/common_strings.xml b/play-services-base/res/values-es/common_strings.xml
deleted file mode 100644
index ba28fe2..0000000
--- a/play-services-base/res/values-es/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Error de servicios de Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Una aplicación requiere la instalación de servicios de Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Una aplicación requiere una actualización de servicios de Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Una aplicación necesita que Android Wear se actualice."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Una aplicación requiere que se habiliten los servicios de Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitada por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Descargar servicios de Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Esta aplicación no se ejecutará si tu teléfono no tiene instalados los servicios de Google Play."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Esta aplicación no se ejecutará si tu tablet no tiene instalados los servicios de Google Play."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Descargar servicios de Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Habilitar servicios de Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Esta aplicación no funcionará si no habilitas los servicios de Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Habilitar servicios de Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Actualizar servicios de Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Actualizar Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Esta aplicación no se ejecutará si no actualizas los servicios de Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Esta aplicación no se ejecutará hasta que actualices Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Error de red"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Se necesita una conexión de datos para establecer conexión con los servicios de Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Cuenta no válida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"La cuenta especificada no existe en este dispositivo. Selecciona otra cuenta."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Error desconocido relacionado con los servicios de Google Play"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Servicios de Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Tu dispositivo no es compatible con los servicios de Google Play, de los cuales dependen tus aplicaciones. Para obtener asistencia, ponte en contacto el fabricante."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Actualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Iniciar sesión"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Iniciar sesión con Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir en teléfono"</string>
-</resources>
diff --git a/play-services-base/res/values-et-rEE/common_strings.xml b/play-services-base/res/values-et-rEE/common_strings.xml
deleted file mode 100644
index 603068f..0000000
--- a/play-services-base/res/values-et-rEE/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Viga Google Play teenustes"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Rakenduse kasutamiseks peavad olema installitud Google Play teenused."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Rakenduse kasutamiseks tuleb värskendada Google Play teenuseid."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Rakendus nõuab rakenduse Android Wear värskendamist."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Rakenduse kasutamiseks peavad olema lubatud Google Play teenused."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Taotluse esitas <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Hankige Google Play teenused"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie telefonis pole."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Selle rakenduse käitamiseks on vaja Google Play teenuseid, mida teie tahvelarvutis pole."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Hankige Google Play teenused"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Lubage Google Play teenused"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"See rakendus ei tööta, kui te ei luba Google Play teenuseid."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Lubage Google Play teenused"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Värskendage Google Play teenuseid"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Rakenduse Android Wear värskendamine"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Seda rakendust ei saa käitada, kui te ei värskenda Google Play teenuseid."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Rakendus töötab ainult siis, kui värskendate rakendust Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Võrgu viga"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play teenustega ühenduse loomiseks on vajalik andmesideühendus."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Vale konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Määratud kontot pole selles seadmes olemas. Valige muu konto."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play teenuste tundmatu probleem."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play teenused"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Teie seade ei toeta Google Play teenuseid, millele mõni teie rakendustest toetub. Abi saamiseks võtke ühendust tootjaga."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Värskenda"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Logi sisse"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Logi sisse Google\'iga"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Ava telefonis"</string>
-</resources>
diff --git a/play-services-base/res/values-eu-rES/common_strings.xml b/play-services-base/res/values-eu-rES/common_strings.xml
deleted file mode 100644
index 189bfa7..0000000
--- a/play-services-base/res/values-eu-rES/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play zerbitzuen errorea"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikazio batek Google Play zerbitzuak instalatzea eskatzen du."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikazio batek Google Play zerbitzuak eguneratzea eskatzen du."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Aplikazio batek Android Wear eguneratzea eskatzen du."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikazio batek Google Play zerbitzuak gaituta egotea eskatzen du."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak eskatu du"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Lortu Google Play zerbitzuak"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Aplikazio hau ez da exekutatuko Google Play zerbitzurik gabe, baina horiek ez daude telefonoan."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Aplikazio hau ez da exekutatuko Google Play zerbitzurik gabe, baina horiek ez daude tabletan."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Lortu Google Play zerbitzuak"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Gaitu Google Play zerbitzuak"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Aplikazio honek ez du funtzionatuko Google Play zerbitzuak gaitzen ez badituzu."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Gaitu Google Play zerbitzuak"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Eguneratu Google Play zerbitzuak"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Eguneratu Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Aplikazio hau ez da exekutatuko Google Play zerbitzuak eguneratzen ez badituzu."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Aplikazio hau ez da exekutatuko Android Wear aplikazioa eguneratu ezean."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Sareko errorea"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Datu-konexioa behar da Google Play zerbitzuetara konektatzeko."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Kontu baliogabea"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Zehaztutako kontua ez dago gailuan. Aukeratu beste kontu bat."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play zerbitzuekin arazo ezezaguna dago."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play zerbitzuak"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Aplikazioetako batzuek behar dituzten Google Play zerbitzuak ez dira zure gailuan onartzen. Laguntza lortzeko, jarri fabrikatzailearen harremanetan."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Eguneratu"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Hasi saioa"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Hasi saioa Google-n"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Ireki telefonoan"</string>
-</resources>
diff --git a/play-services-base/res/values-fa/common_strings.xml b/play-services-base/res/values-fa/common_strings.xml
deleted file mode 100644
index 6de54d6..0000000
--- a/play-services-base/res/values-fa/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"‏خطا در خدمات Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"‏برنامه‌ای نیاز به نصب خدمات Google Play دارد."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"‏‫برنامه‌ای نیاز به یک به‌روزرسانی برای خدمات Google Play دارد."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"‏برنامه باید به برنامه Android Wear به‌روزرسانی شود."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"‏برنامه‌ای نیاز به فعال شدن خدمات Google Play دارد."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"درخواست توسط <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"‏دریافت خدمات Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"‏این برنامه بدون خدمات Google Play اجرا نمی‌شود، این خدمات در تلفن شما وجود ندارد."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"‏این برنامه بدون خدمات Google Play اجرا نمی‌شود، این خدمات در رایانهٔ لوحی شما وجود ندارد."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"‏دریافت خدمات Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"‏فعال کردن خدمات Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"‏تا زمانی‌که خدمات Google Play را فعال نکنید این برنامه کار نمی‌کند."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"‏فعال کردن خدمات Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"‏به‌روزرسانی خدمات Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"‏به‌روزرسانی Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"‏تا زمانی‌که خدمات Google Play را به‌روز نکنید این برنامه کار نمی‌کند."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"‏این برنامه اجرا نمی‌شود مگر اینکه برنامه Android Wear را به‌روزرسانی کنید."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"خطای شبکه"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"‏برای اتصال به خدمات Google Play اتصال داده لازم است."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"حساب نامعتبر"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"حسابی که تعیین کردید در این دستگاه وجود ندارد. لطفاً حساب دیگری را انتخاب کنید."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"‏مشکل نامشخص در خدمات Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"‏خدمات Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"‏خدمات Google Play، که برخی از برنامه‌های شما به آن وابسته است، توسط دستگاه شما پشتیبانی نمی‌شود. لطفاً برای دریافت کمک با سازنده تماس بگیرید."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"به‌روزرسانی"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ورود به سیستم"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"‏ورود به سیستم با Google‎"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"باز کردن در تلفن"</string>
-</resources>
diff --git a/play-services-base/res/values-fi/common_strings.xml b/play-services-base/res/values-fi/common_strings.xml
deleted file mode 100644
index 9b96f49..0000000
--- a/play-services-base/res/values-fi/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Virhe Google Play -palveluissa"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Asenna Google Play -palvelut, jotta sovellus toimii."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Päivitä Google Play -palvelut, jotta sovellus toimii."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android Wear -sovellus täytyy päivittää toisen sovelluksen takia."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Ota käyttöön Google Play -palvelut, jotta sovellus toimii."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Pyynnön teki <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Asenna Google Play -palvelut"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat puhelimesta."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Tämä sovellus ei toimi ilman Google Play -palveluita, jotka puuttuvat tablet-laitteesta."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Asenna Google Play -palvelut"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Ota Google Play -palvelut käyttöön"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Tämä sovellus ei toimi, ellet ota Google Play -palveluita käyttöön."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Ota Google Play -palv. käyttöön"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Päivitä Google Play -palvelut"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Päivitä Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Tämä sovellus ei toimi, ellet päivitä Google Play -palveluita."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Tämä sovellus ei toimi, ellet päivitä Android Wear -sovellusta."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Verkkovirhe"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play -palveluiden käyttöön tarvitaan tietoliikenneyhteys."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Tili ei kelpaa"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Kyseistä tiliä ei ole tällä laitteella. Valitse toinen tili."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Tuntematon ongelma käytettäessä Google Play -palveluita."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play -palvelut"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play -palveluita, joita osa sovelluksistasi käyttää, ei tueta laitteellasi. Pyydä ohjeita laitteen valmistajalta."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Päivitä"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Kirjaudu"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Kirjaudu Google-tiliin"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Avaa puhelimessa"</string>
-</resources>
diff --git a/play-services-base/res/values-fr-rCA/common_strings.xml b/play-services-base/res/values-fr-rCA/common_strings.xml
deleted file mode 100644
index 9ddaded..0000000
--- a/play-services-base/res/values-fr-rCA/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erreur liée aux services Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Une application demande l\'installation des services Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Une application requiert la mise à jour des services Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Une application nécessite une mise à jour d\'Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Une application requiert l\'activation des services Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Demandée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Installer les services Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Installer les services Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activer les services Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Cette application ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activer les services Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Mettre à jour les services Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Mettre à jour Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour l\'application Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erreur réseau"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Vous devez disposer d\'une connexion de données pour utiliser les services Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Compte erroné"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Le compte indiqué n\'existe pas sur cet appareil. Veuillez sélectionner un autre compte."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problème inconnu avec les services Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Services Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Les services Google Play, dont dépendent certaines de vos applications, ne sont pas compatibles avec votre appareil. Veuillez contacter le fabricant pour obtenir de l\'aide."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Mettre à jour"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Connexion"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Se connecter via Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Ouvrir sur le téléphone"</string>
-</resources>
diff --git a/play-services-base/res/values-fr/common_strings.xml b/play-services-base/res/values-fr/common_strings.xml
deleted file mode 100644
index d993858..0000000
--- a/play-services-base/res/values-fr/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erreur liée aux services Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Une application demande l\'installation des services Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Une application demande la mise à jour des services Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Une application nécessite une mise à jour du Bios de l\'application Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Une application demande l\'activation des services Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Notification issue de l\'application \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Installer les services Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre téléphone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Cette application ne fonctionnera pas sans les services Google Play, qui ne sont pas installés sur votre tablette."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Installer services Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activer les services Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Cette application ne fonctionnera pas tant que vous n\'aurez pas activé les services Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activer services Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Mettre à jour les services Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Mettre à jour Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour les services Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Cette application ne fonctionnera pas tant que vous n\'aurez pas mis à jour l\'application Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erreur réseau"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Vous devez disposer d\'une connexion de données pour utiliser les services Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Compte erroné"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Le compte indiqué n\'existe pas sur cet appareil. Veuillez sélectionner un autre compte."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problème inconnu avec les services Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Services Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Les services Google Play, dont dépendent certaines de vos applications, ne sont pas compatibles avec votre appareil. Veuillez contacter le fabricant pour obtenir de l\'aide."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Mettre à jour"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Connexion"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Se connecter avec Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Ouvrir sur le téléphone"</string>
-</resources>
diff --git a/play-services-base/res/values-gl-rES/common_strings.xml b/play-services-base/res/values-gl-rES/common_strings.xml
deleted file mode 100644
index 8f35507..0000000
--- a/play-services-base/res/values-gl-rES/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erro nos servizos de Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"As aplicacións requiren a instalación dos servizos de Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Unha aplicación require a actualización dos servizos de Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Unha aplicación require unha actualización da aplicación Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"As aplicacións requiren ter os servizos de Google Play activados."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Descargar servizos de Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Esta aplicación non se executará se o teléfono non ten instalados os servizos de Google Play."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Esta aplicación non se executará se o tablet non ten instalados os servizos de Google Play."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Obter servizos de Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activar servizos de Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Esta aplicación non funcionará se non activas os servizos de Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activar servizos de Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Actualizar os servizos de Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Actualizar Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Esta aplicación non se executará se non actualizas os servizos de Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Esta aplicación non se executará se non actualizas a aplicación Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erro de rede"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"É necesario dispoñer dunha conexión de datos para conectarse aos servizos de Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Conta non válida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"A conta especificada non existe neste dispositivo. Escolle unha diferente."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Erro descoñecido cos servizos de Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Servizos de Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Os servizos de Google Play, nos que confían algunhas das túas aplicacións, non son compatibles co teu dispositivo. Ponte en contacto co fabricante para obter asistencia."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Actualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Iniciar sesión"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Iniciar sesión con Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir no teléfono"</string>
-</resources>
diff --git a/play-services-base/res/values-hi/common_strings.xml b/play-services-base/res/values-hi/common_strings.xml
deleted file mode 100644
index 5edabf2..0000000
--- a/play-services-base/res/values-hi/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play सेवाएं त्रुटि"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"ऐप्लिकेशन के लिए Google Play सेवाएं इंस्टॉल किए जाने की आवश्यकता है."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"ऐप्लिकेशन के लिए Google Play सेवाओं में नई जानकारी की आवश्यकता है."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"ऐप्लिकेशन को Android Wear ऐप्स में अपडेट की आवश्यकता है."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"ऐप्लिकेशन के लिए Google Play सेवाएं सक्षम किए जाने की आवश्यकता है."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> के द्वारा अनुरोधित"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play सेवाएं पाएं"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"यह ऐप्स  Google Play सेवाओं के बिना नहीं चलेगा, जो आपके फ़ोन में नहीं हैं."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"यह ऐप्स  Google Play सेवाओं के बिना नहीं चलेगा, जो आपके टेबलेट में नहीं हैं."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play सेवाएं पाएं"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play सेवाएं सक्षम करें"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"जब तक आप Google Play सेवाएं सक्षम नहीं करते, तब तक यह ऐप्स  कार्य नहीं करेगा."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play सेवाएं सक्षम करें"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play सेवाएं से नई जानकारी"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear अपडेट करें"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"जब तक आप Google Play सेवाओं से नई जानकारी नहीं लेते हैं, तब तक यह ऐप्स  नहीं चलेगा."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"यह ऐप्स तब तक नहीं चलेगा, जब तक कि आप Android Wear ऐप्स को अपडेट नहीं करते."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"नेटवर्क त्रुटि"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play सेवाओं से कनेक्ट करने के लिए डेटा कनेक्शन की आवश्यकता है."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"अमान्य खाता"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"निर्दिष्ट खाता इस डिवाइस पर मौजूद नहीं है. कृपया कोई भिन्न खाता चुनें."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play सेवाओं के साथ अज्ञात समस्या."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play सेवाएं"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play सेवाएं, जिन पर आपके कुछ ऐप्स  निर्भर करते हैं, आपके डिवाइस द्वारा समर्थित नहीं हैं. कृपया सहायता के लिए निर्माता से संपर्क करें."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"नई जानकारी पाएं"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"प्रवेश करें"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google से प्रवेश करें"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"फ़ोन पर खोलें"</string>
-</resources>
diff --git a/play-services-base/res/values-hr/common_strings.xml b/play-services-base/res/values-hr/common_strings.xml
deleted file mode 100644
index 49e1daf..0000000
--- a/play-services-base/res/values-hr/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Pogreška Usluga za Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikacija zahtijeva instaliranje Usluga za Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikacija zahtijeva ažuriranje Usluga za Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Aplikacija zahtijeva ažuriranje na aplikaciju Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikacija zahtijeva da Usluge za Google Play budu omogućene."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Zahtijeva aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Preuzmi usluge za Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem telefonu."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ova aplikacija neće funkcionirati bez usluga za Google Play, koje nisu instalirane na vašem tabletnom računalu."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Preuzmi usluge za Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Omogući usluge za Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ova aplikacija neće raditi ako ne omogućite usluge za Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Omogući usluge za Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Ažuriraj usluge za Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Ažurirajte Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ova se aplikacija neće pokrenuti ako ne ažurirate usluge za Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ova aplikacija neće funkcionirati ako ne ažurirate aplikaciju Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Mrežna pogreška"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Potrebna je podatkovna veza za povezivanje s uslugama Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Nevažeći račun"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Navedeni račun ne postoji na ovom uređaju. Odaberite neki drugi račun."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Nepoznata poteškoća s uslugama za Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Usluge za Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Usluge za Google Play, koje su potrebne za funkcioniranje nekih vaših aplikacija, nisu podržane na vašem uređaju. Pomoć potražite od proizvođača."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Ažuriranje"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Prijava"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Prijava uslugom Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Otvaranje na telefonu"</string>
-</resources>
diff --git a/play-services-base/res/values-hu/common_strings.xml b/play-services-base/res/values-hu/common_strings.xml
deleted file mode 100644
index 7f57e27..0000000
--- a/play-services-base/res/values-hu/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play-szolgáltatások – hiba"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Egy alkalmazás Google Play-szolgáltatások telepítését kéri."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Egy alkalmazás Google Play-szolgáltatások frissítését kéri."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Egy alkalmazás az Android Wear-alkalmazás frissítését igényli."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Egy alkalmazás Google Play-szolgáltatások engedélyezését kéri."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> kérésére"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Play-szolgáltatások telepítése"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Az alkalmazás működéséhez a Google Play-szolgáltatások szükségesek, ezek nincsenek telepítve a telefonon."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Az alkalmazás működéséhez a Google Play-szolgáltatások szükségesek, ezek nincsenek telepítve a táblagépen."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Play-szolgáltatások telepítése"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play-szolgáltatások aktiválása"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Az alkalmazás csak akkor fog működni, ha engedélyezi a Google Play-szolgáltatásokat."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Play-szolgáltatások aktiválása"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Play-szolgáltatások frissítése"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Az Android Wear frissítése"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Az alkalmazás csak akkor fog működni, ha frissíti a Google Play-szolgáltatásokat."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ez az alkalmazás nem működik, amíg nem frissíti az Android Wear-alkalmazást."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Hálózati hiba"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"A Google Play-szolgáltatásokhoz történő kapcsolódáshoz adatkapcsolat szükséges."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Érvénytelen fiók"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"A megadott fiók nem létezik ezen az eszközön. Kérjük, válasszon másik fiókot."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Ismeretlen hiba a Google Play-szolgáltatásokban."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-szolgáltatások"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"A Google Play-szolgáltatásokat, amelyre egyes alkalmazások támaszkodnak, nem támogatja az eszköz. Segítségért forduljon az eszköz gyártójához."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Frissítés"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Belépés"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google-bejelentkezés"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Megnyitás a telefonon"</string>
-</resources>
diff --git a/play-services-base/res/values-hy-rAM/common_strings.xml b/play-services-base/res/values-hy-rAM/common_strings.xml
deleted file mode 100644
index a88c957..0000000
--- a/play-services-base/res/values-hy-rAM/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play ծառայությունների սխալ կա"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Ինչ-որ հավելված պահանջում է տեղադրել Google Play ծառայությունները:"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Ինչ-որ հավելված պահանջում է թարմացնել Google Play ծառայությունները:"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Ծրագիրը պահանջում է թարմացնել Android Wear-ը:"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Ինչ-որ հավելված պահանջում է միացնել Google Play ծառայությունները:"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ի հարցմամբ"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Տեղադրեք Google Play ծառայությունները"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր հեռախոսում:"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Այս հավելվածը չի գործարկվի առանց Google Play ծառայությունների, որոնք բացակայում են ձեր գրասալիկում:"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Տեղադրել Google Play ծառայությունները"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Միացնել Google Play ծառայությունները"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Այս ծրագիրը չի աշխատի, եթե դուք չմիացնեք Google Play ծառայությունները:"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Միացնել Google Play ծառայությունները"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Նորացրեք Google Play ծառայությունները"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Թարմացնել Android Wear-ը"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Այս ծրագիրը չի գործարկվի, եթե դուք չնորացնեք Google Play ծառայությունները:"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Այս ծրագիրը չի գործարկվի, եթե չթարմացնեք Android Wear-ը:"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Ցանցի սխալ կա"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Պահանջվում է տվյալների կապ` Google Play ծառայություններին միանալու համար:"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Հաշիվն անվավեր է"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Նշված հաշիվը գոյություն չունի այս սարքում: Ընտրեք այլ հաշիվ:"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Անհայտ խնդիր՝ Google Play ծառայություններում:"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play ծառայություններ"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play ծառայությունները, որոնց ապավինում են ձեր ծրագրերից որոշները, չեն աջակցվում ձեր սարքի կողմից: Խնդրում ենք կապվել արտադրողի հետ օգնության համար:"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Նորացնել"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Մուտք գործել"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Մուտք գործեք Google-ով"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Բացել հեռախոսում"</string>
-</resources>
diff --git a/play-services-base/res/values-in/common_strings.xml b/play-services-base/res/values-in/common_strings.xml
deleted file mode 100644
index d2c3df5..0000000
--- a/play-services-base/res/values-in/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Kesalahan layanan Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikasi mewajibkan pemasangan layanan Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikasi mewajibkan pembaruan untuk layanan Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Aplikasi memerlukan pembaruan ke aplikasi Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikasi mewajibkan agar layanan Google Play diaktifkan."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Diminta oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Dapatkan layanan Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di ponsel Anda."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Aplikasi ini tidak akan berjalan tanpa layanan Google Play, yang tidak ada di tablet Anda."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Dapatkan layanan Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktifkan layanan Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Aplikasi ini tidak akan bekerja sampai Anda mengaktifkan layanan Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktifkan layanan Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Perbarui layanan Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Perbarui Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Aplikasi ini tidak akan berjalan sampai Anda memperbarui layanan Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Aplikasi ini tidak akan berjalan sampai Anda memperbarui layanan Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Kesalahan Jaringan"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Sambungan data diperlukan untuk tersambung ke layanan Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Akun Tidak Valid"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Akun yang ditentukan tidak ada di perangkat ini. Pilih akun lain."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Masalah tidak diketahui pada layanan Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Layanan Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Layanan Google Play, yang diandalkan oleh beberapa aplikasi Anda, tidak didukung oleh perangkat Anda. Hubungi pabrikan untuk mendapatkan bantuan."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Perbarui"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Masuk"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Masuk dengan Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Buka di ponsel"</string>
-</resources>
diff --git a/play-services-base/res/values-is-rIS/common_strings.xml b/play-services-base/res/values-is-rIS/common_strings.xml
deleted file mode 100644
index 00975b7..0000000
--- a/play-services-base/res/values-is-rIS/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Villa í þjónustu Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Forrit krefst þess að þjónusta Google Play sé sett upp."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Forrit krefst þess að þjónusta Google Play sé uppfærð."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Forrit krefst uppfærslu á Android Wear forritinu."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Forrit krefst þess að þjónusta Google Play sé virk."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> bað um"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Sækja þjónustu Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Þetta forrit getur ekki keyrt án þjónustu Google Play, sem vantar í símann þinn."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Þetta forrit getur ekki keyrt án þjónustu Google Play, sem vantar í spjaldtölvuna þína."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Sækja þjónustu Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Virkja þjónustu Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Þetta forrit virkar ekki nema þú gerir þjónustu Google Play virka."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Virkja þjónustu Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Uppfæra þjónustu Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Uppfærðu Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Þetta forrit getur ekki keyrt nema þú uppfærir þjónustu Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Þetta forrit getur ekki keyrt nema þú uppfærir Android Wear forritið."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Netvilla"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Gagnatengingar er krafist til að tengjast þjónustu Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ógildur reikningur"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Tilgreindur reikningur er ekki til staðar í þessu tæki. Veldu annan reikning."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Óþekkt vandamál með þjónustu Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Þjónusta Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Þjónusta Google Play, sem sum forrit reiða sig á, er ekki studd í tækinu þínu. Hafðu samband við framleiðandann til að fá aðstoð."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Uppfæra"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Skrá inn"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Skrá inn með Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Opna í símanum"</string>
-</resources>
diff --git a/play-services-base/res/values-it/common_strings.xml b/play-services-base/res/values-it/common_strings.xml
deleted file mode 100644
index d88b4c6..0000000
--- a/play-services-base/res/values-it/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Errore Google Play Services"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Un\'applicazione richiede l\'installazione di Google Play Services."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Un\'applicazione richiede un aggiornamento di Google Play Services."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Un\'applicazione richiede l\'aggiornamento dell\'app Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Un\'applicazione richiede l\'attivazione di Google Play Services."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Richiesta da <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Installa Google Play Services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"L\'app non funzionerà senza Google Play Services, non presente sul tuo telefono."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"L\'app non funzionerà senza Google Play Services, non presente sul tuo tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Installa Google Play Services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Attiva Google Play Services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"L\'app non funzionerà se non attivi Google Play Services."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Attiva Google Play Services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Aggiorna Google Play Services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Aggiorna Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"L\'app non funzionerà se non aggiorni Google Play Services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Questa app funzionerà solo dopo avere aggiornato Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Errore di rete"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"È necessaria una connessione dati per connettersi a Google Play Services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Account non valido"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"L\'account specificato non esiste su questo dispositivo. Scegli un altro account."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problema sconosciuto con Google Play Services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play Services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"La piattaforma Google Play Services, su cui sono basate alcune delle tue applicazioni, non è supportata dal dispositivo in uso. Per assistenza, contatta il produttore."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Aggiorna"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Accedi"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Accedi con Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Apri sul telefono"</string>
-</resources>
diff --git a/play-services-base/res/values-iw/common_strings.xml b/play-services-base/res/values-iw/common_strings.xml
deleted file mode 100644
index 67519b4..0000000
--- a/play-services-base/res/values-iw/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"‏שגיאה בשירותי Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"‏קיימת אפליקציה המחייבת התקנה של שירותי Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"‏קיימת אפליקציה המחייבת עדכון עבור שירותי Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"‏אפליקציה מסוימת דורשת עדכון לאפליקציה Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"‏קיימת אפליקציה המחייבת הפעלה של שירותי Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"התבקשה על ידי <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"‏קבל את שירותי Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"‏אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטלפון שלך."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"‏אפליקציה זו לא תפעל ללא שירותי Google Play, החסרים בטאבלט שלך."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"‏קבל את שירותי Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"‏הפעלת שירותי Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"‏אפליקציה זו לא תעבוד אם לא תפעיל את שירותי Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"‏הפעל את שירותי Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"‏עדכון שירותי Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"‏עדכון Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"‏אפליקציה זו לא תפעל אם לא תעדכן את שירותי Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"‏אפליקציה זו לא תפעל עד שתעדכן את האפליקציה Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"שגיאת רשת."</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"‏דרוש חיבור נתונים כדי להתחבר לשירותי Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"חשבון לא חוקי"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"החשבון שצוין לא קיים במכשיר זה. בחר חשבון אחר."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"‏בעיה לא ידועה בשירותי Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"‏שירותי Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"‏שירותי Google Play, שחלק מהאפליקציות שלך מתבססות עליהם, אינם נתמכים על ידי המכשיר שברשותך. צור קשר עם היצרן לקבלת סיוע."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"עדכן"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"היכנס"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"‏היכנס באמצעות Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"פתח בטלפון"</string>
-</resources>
diff --git a/play-services-base/res/values-ja/common_strings.xml b/play-services-base/res/values-ja/common_strings.xml
deleted file mode 100644
index d8a928b..0000000
--- a/play-services-base/res/values-ja/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play開発者サービスのエラー"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"アプリではGoogle Play開発者サービスをインストールする必要があります"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"アプリではGoogle Play開発者サービスを更新する必要があります"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android Wearアプリの更新が必要です。"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"アプリではGoogle Play開発者サービスを有効にする必要があります"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g>によるリクエスト"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Play開発者サービスの入手"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いの携帯端末にはインストールされていません。"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"このアプリの実行にはGoogle Play開発者サービスが必要ですが、お使いのタブレットにはインストールされていません。"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Play開発者サービスの入手"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Play開発者サービスの有効化"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"このアプリの実行には、Google Play開発者サービスの有効化が必要です。"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Play開発者サービスの有効化"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Play開発者サービスの更新"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wearの更新"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"このアプリの実行には、Google Play開発者サービスの更新が必要です。"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android Wearアプリを使用するにはアプリの更新が必要です。"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ネットワークエラー"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play開発者サービスに接続するには、データ接続が必要です。"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"無効なアカウント"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"指定したアカウントはこの端末上に存在しません。別のアカウントを選択してください。"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play開発者サービスで原因不明の問題が発生しました。"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play開発者サービス"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"一部のアプリが使用しているGoogle Play開発者サービスは、お使いの端末ではサポートされていません。詳しくは、端末メーカーまでお問い合わせください。"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"更新"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ログイン"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Googleでログイン"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"端末で開く"</string>
-</resources>
diff --git a/play-services-base/res/values-ka-rGE/common_strings.xml b/play-services-base/res/values-ka-rGE/common_strings.xml
deleted file mode 100644
index 9db9f63..0000000
--- a/play-services-base/res/values-ka-rGE/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play Services-ის შეცდომა"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"აპლიკაცია საჭიროება Google Play Services-ის ინსტალაციას."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"აპლიკაცია საჭიროებს Google Play Services-ის განახლებას."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"აპლიკაცია საჭიროებს Android Wear აპის განახლებას."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"აპლიკაცია საჭიროებს გააქტიურებულ Google Play Services."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"მომთხოვნი: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play სერვისების მიღება"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ეს აპი ვერ გაეშვება Google Play სერვისების გარეშე, რაც თქვენს ტელეფონზე ვერ იძებნება."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play სერვისების მიღება"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play სერვისების გააქტიურება"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"ეს აპი არ იმუშავებს, თუ არ გაააქტიურებთ Google Play სერვისებს."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play სერვისების გააქტიურება"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play სერვისების განახლება"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear-ის განახლება"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"ეს აპი ვერ გაეშვება, თუ Google Play სერვისებს არ განაახლებთ."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"ეს აპი ვერ გაეშვება, თუ Android Wear აპს არ განაახლებთ."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ქსელის შეცდომა"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play Services-თან დასაკავშირებლად მონაცემთა გადაცემა აუცილებელია."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"ანგარიში არასწორია"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"მითითებული ანგარიში ამ მოწყობილობაზე არ არსებობს. გთხოვთ, აირჩიოთ სხვა ანგარიში."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play სერვისებთან დაკავშირებით უცნობი შეფერხება წარმოიშვა."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play სერვისები"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play სერვისები, რაც თქვენს ზოგიერთ აპს ჭირდება, თქვენს მოწყობილობაზე მხარდაჭერილი არ არის. გთხოვთ, დაუკავშირდეთ მწარმოებელს დახმარებისათვის."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"განახლება"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"შესვლა"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google-ით შესვლა"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ტელეფონზე გახსნა"</string>
-</resources>
diff --git a/play-services-base/res/values-kk-rKZ/common_strings.xml b/play-services-base/res/values-kk-rKZ/common_strings.xml
deleted file mode 100644
index ecc6b44..0000000
--- a/play-services-base/res/values-kk-rKZ/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play қызметтерінің қатесі"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Қолданба Google Play қызметтерін орнатуды талап етеді."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Қолданба Google Play қызметтерін жаңартуды талап етеді."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Қолданба Android Wear қолданбасын жаңартуды қажет етеді."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Қолданба Google Play қызметтерін қосуды қажет етеді."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> арқылы сұралған"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play қызметтерін алу"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Телефоныңызда жоқ Google Play қызметтерінсіз бұл қолданба іске қосылмайды."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Планшетіңізде жоқ Google Play қызметтерінсіз бұл қолданба іске қосылмайды."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play қызметтерін алу"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play қызметтерін қосу"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Бұл қолданба Google Play қызметтерін қосқанша жұмыс істемейді."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play қызметтерін қосу"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play қызметтерін жаңарту"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear қолданбасын жаңарту"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Бұл қолданба Google Play қызметтерін жаңартқанша іске қосылмайды."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Бұл қолданба Android Wear қолданбасын жаңартқанша іске қосылмайды."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Желі қатесі"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play қызметтеріне қосылу үшін деректер байланысы талап етіледі."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Жарамсыз тіркелгі"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Бұл құрылғыда көрсетілген тіркелгі жоқ. Басқа тіркелгіні таңдаңыз."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play қызметтерімен белгісіз мәселе."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play қызметтері"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Кейбір қолданбаларыңыз үшін қажет Google Play қызметтеріне құрылғыңыз қолдау көрсетпейді. Көмек алу үшін өндірушіге хабарласыңыз."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Жаңарту"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Кіру"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google арқылы кіру"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Телефонда ашу"</string>
-</resources>
diff --git a/play-services-base/res/values-km-rKH/common_strings.xml b/play-services-base/res/values-km-rKH/common_strings.xml
deleted file mode 100644
index 17fedd3..0000000
--- a/play-services-base/res/values-km-rKH/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"កំហុស​​សេវាកម្ម​ Google កម្សាន្ត"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"កម្មវិធី​ទាមទារ​ឲ្យ​ដំឡើង​សេវាកម្ម​ Google កម្សាន្ត។"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"កម្មវិធី​ទាមទារ​​ធ្វើ​បច្ចុប្បន្នភាព​សេវាកម្ម ​Google កម្សាន្ត។"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"កម្មវិធី​ទាមទារ​បច្ចុប្បន្នភាព​ចំពោះ​កម្មវិធី Android Wear ។"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"កម្មវិធី​ទាមទារ​ឲ្យ​បើក​សេវាកម្ម​ Google កម្សាន្ត។"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"បាន​ស្នើ​ដោយ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"ទទួល​សេវាកម្ម​កម្សាន្ត Google"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​​ទេ​បើ​គ្មាន​​សេវាកម្ម​កម្សាន្ត​ Google ដែល​ទូរស័ព្ទ​របស់​​អ្នក​មិន​មាន។"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"​​កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​​ទេ​បើ​គ្មាន​​សេវាកម្ម​កម្សាន្ត​ Google ដែល​​កុំព្យូទ័រ​បន្ទះ​របស់​អ្នក​មិន​មាន។"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"ទទួល​សេវាកម្ម​កម្សាន្ត Google"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"បើក​សេវាកម្ម​កម្សាន្ត Google"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"កម្ម​វិធី​នេះ​នឹង​មិន​ដំណើរការ​ទេ​ លុះត្រាតែ​អ្នក​បើក​សេវាកម្ម​​កម្សាន្ត​ Google ។"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"បើក​សេវាកម្ម​កម្សាន្ត Google"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"ធ្វើ​បច្ចុប្បន្នភាព​សេវាកម្ម​កម្សាន្ត Google"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"ធ្វើ​បច្ចុប្បន្នភាព Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​ទេ​ លុះត្រាតែ​អ្នក​ធ្វើ​បច្ចុប្បន្នភាព​សេវាកម្ម​កម្សាន្ត Google ។"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"កម្មវិធី​នេះ​នឹង​មិន​ដំណើរការ​ទេ លុះ​ត្រា​តែ​អ្នក​ធ្វើ​បច្ចុប្បន្នភាព​​កម្មវិធី Android Wear ។"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"កំហុស​​បណ្ដាញ"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"បាន​ទាមទារ​ការ​តភ្ជាប់​ទិន្នន័យ ដើម្បី​ភ្ជាប់​សេវាកម្ម​ឃ្លាំង​កម្មវិធី។"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"គណនី​មិន​ត្រឹមត្រូវ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"គណនី​ដែល​បាន​បញ្ជាក់​មិន​មាន​នៅ​លើ​ឧបករណ៍​នេះ​ទេ។ សូម​ជ្រើស​គណនី​ផ្សេង​។"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"មិន​ស្គាល់​បញ្ហា​ជាមួយ​សេវាកម្ម​កម្សាន្ត Google ។"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"សេវាកម្ម​កម្សាន្ត​ Google"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"សេវាកម្ម​កម្សាន្ត Google អាស្រ័យ​លើ​កម្មវិធី​របស់​អ្នក មិន​ត្រូវ​បាន​គាំទ្រ​ដោយ​ឧបករណ៍​របស់​អ្នក។ សូម​ទាក់ទង​ក្រុមហ៊ុន​ផលិត​សម្រាប់​ជំនួយ។"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"ធ្វើ​បច្ចុប្បន្នភាព"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ចូល"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"ចូល​ដោយ​ប្រើ​ Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"បើក​តាម​ទូរស័ព្ទ"</string>
-</resources>
diff --git a/play-services-base/res/values-kn-rIN/common_strings.xml b/play-services-base/res/values-kn-rIN/common_strings.xml
deleted file mode 100644
index e144daf..0000000
--- a/play-services-base/res/values-kn-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play ಸೇವೆಗಳ ದೋಷ"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"ಅಪ್ಲಿಕೇಶನ್‌ಗೆ Google Play ಸೇವೆಗಳು ಸ್ಥಾಪನೆಯಾಗಿರಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"ಅಪ್ಲಿಕೇಶನ್‌ಗೆ Google Play ಸೇವೆಗಳ ನವೀಕರಣದ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android Wear ಅಪ್ಲಿಕೇಶನ್ ನವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"ಅಪ್ಲಿಕೇಶನ್‌ಗೆ Google Play ಸೇವೆಗಳು ಸಕ್ರಿಯಗೊಂಡಿರಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> ನಿಂದ ವಿನಂತಿಸಲಾಗಿದೆ"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play ಸೇವೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ನಿಮ್ಮ ಫೋನ್‍‍ನಲ್ಲಿ ಕಾಣೆಯಾಗಿರುವ ಈ ಅಪ್ಲಿಕೇಶನ್, Google Play ಸೇವೆಗಳಿಲ್ಲದೆ ಚಾಲನೆಯಾಗುವುದಿಲ್ಲ."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಕಾಣೆಯಾಗಿರುವ ಈ ಅಪ್ಲಿಕೇಶನ್,  Google Play ಸೇವೆಗಳಿಲ್ಲದೆ ಚಾಲನೆಯಾಗುವುದಿಲ್ಲ."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play ಸೇವೆಗಳನ್ನು ಪಡೆಯಿರಿ"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Google Play ಸೇವೆಗಳನ್ನು ನೀವು ಸಕ್ರಿಯಗೊಳಿಸದ ಹೊರತು ಈ ಅಪ್ಲಿಕೇಶನ್ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play ಸೇವೆಗಳನ್ನು ನವೀಕರಿಸಿ"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear ನವೀಕರಿಸಿ"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"ನೀವು Google Play ಸೇವೆಗಳನ್ನು ನವೀಕರಿಸದ ಹೊರತು ಈ ಅಪ್ಲಿಕೇಶನ್ ಚಾಲನೆಯಾಗುವುದಿಲ್ಲ."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"ನೀವು Android Wear ಅಪ್ಲಿಕೇಶನ್ ನವೀಕರಿಸದ ಹೊರತು ಈ ಅಪ್ಲಿಕೇಶನ್ ರನ್ ಆಗುವುದಿಲ್ಲ."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ನೆಟ್‍ವರ್ಕ್ ದೋಷ"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕ ಹೊಂದಲು ಡೇಟಾ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"ಅಮಾನ್ಯವಾದ ಖಾತೆ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"ಈ ಸಾಧನದಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾದ ಖಾತೆಯು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ. ದಯವಿಟ್ಟು ಬೇರೆಯ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play ಸೇವೆಗಳಿಗೆ ಅಜ್ಞಾತ ಸಮಸ್ಯೆ."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play ಸೇವೆಗಳು"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"ನಿಮ್ಮ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅವಂಬಿಸಿರುವಂತಹ Google Play ಸೇವೆಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನವು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ದಯವಿಟ್ಟು ನೆರವಿಗಾಗಿ ಉತ್ಪಾದಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"ನವೀಕರಿಸು"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ಸೈನ್ ಇನ್ ಮಾಡು"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ಫೋನ್‌ನಲ್ಲಿ ತೆರೆಯಿರಿ"</string>
-</resources>
diff --git a/play-services-base/res/values-ko/common_strings.xml b/play-services-base/res/values-ko/common_strings.xml
deleted file mode 100644
index 9271b80..0000000
--- a/play-services-base/res/values-ko/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play 서비스 오류"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Google Play 서비스를 설치해야 하는 애플리케이션입니다."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Google Play 서비스를 업데이트해야 하는 애플리케이션입니다."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android Wear 앱에 대한 업데이트가 필요한 애플리케이션이 있습니다."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Google Play 서비스를 사용 설정해야 하는 애플리케이션입니다."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g>에서 요청"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play 서비스 설치"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"휴대전화에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"태블릿에 Google Play 서비스가 설치되어 있어야 이 앱이 실행됩니다."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play 서비스 설치"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play 서비스 사용"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Google Play 서비스를 사용하도록 설정해야 이 앱이 작동합니다."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play 서비스 사용"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play 서비스 업데이트"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear 업데이트"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Google Play 서비스를 업데이트해야만 이 앱이 실행됩니다."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android Wear 앱을 업데이트해야만 이 앱이 실행됩니다."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"네트워크 오류"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play 서비스에 연결하려면 데이터 연결이 필요합니다."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"올바르지 않은 계정"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"지정한 계정이 이 기기에 존재하지 않습니다. 다른 계정을 선택하세요."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play 서비스에 알 수 없는 문제가 발생했습니다."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play 서비스"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"일부 사용자 애플리케이션에 필요한 Google Play 서비스가 사용자 기기에서 지원되지 않습니다. 기기 제조업체에 문의하시기 바랍니다."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"업데이트"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"로그인"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google 계정으로 로그인"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"휴대전화에서 열기"</string>
-</resources>
diff --git a/play-services-base/res/values-ky-rKG/common_strings.xml b/play-services-base/res/values-ky-rKG/common_strings.xml
deleted file mode 100644
index e92e31f..0000000
--- a/play-services-base/res/values-ky-rKG/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play кызматтарынын катасы"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Колдонмону иштетүү үчүн, Google Play кызматтарын орнотуу керек."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Колдонмону иштетүү үчүн, Google Play Кызматтарын жаңыртуу керек."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Колдонмону Android Тагынма колдонмосуна жаңыртуу керек."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Колдонмону иштетүү үчүн, Google Play Кызматтарын иштетүү керек."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> сурап жатат"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play кызматтарын алуу"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Бул колдонмо Google Play кызматтарысыз иштебейт, алар сиздин телефонуңузда жок."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Бул колдонмо Google Play кызматтарысыз иштебейт, алар сиздин планшетиңизде жок."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play кызматтарын алуу"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play кызматтарын иштетүү"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Бул колдонмо Google Play кызматтары иштетилмейинче иштебейт."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play кызматтарын иштетүү"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play кызматтарын жаңыртуу"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Тагынманы жаңыртуу"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Бул колдонмо Google Play кызматтары жаңыртылмайынча иштебейт."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android Тагынма колдонмосу жаңыртылмайынча бул колдонмо иштебейт."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Тармак катасы"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play Кызматтарына туташуу үчүн, дайындарды өткөрүүчү туташуу талап кылынат."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Каттоо эсеби жараксыз"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Көрсөтүлгөн каттоо эсеби бул түзмөктө жок. Башка каттоо эсебин тандаңыз."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play кызматтарында келип чыккан белгисиз көйгөй."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play кызматтары"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Айрым колдонмолоруңузга байланышкан Google Play кызматтары түзмөгүңүздө колдоого алынбайт. Жардам алуу үчүн өндүрүүчүгө кайрылыңыз."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Жаңыртуу"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Кирүү"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google менен кирүү"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Телефондо ачык"</string>
-</resources>
diff --git a/play-services-base/res/values-lo-rLA/common_strings.xml b/play-services-base/res/values-lo-rLA/common_strings.xml
deleted file mode 100644
index ebdd89d..0000000
--- a/play-services-base/res/values-lo-rLA/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play Services ​ເກີດ​ຄວາມ​ຜິດ​ພາດ"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"​ແອັບ​ພ​ລິ​ເຄ​ຊັນ​ຕ້ອງ​ການ​ໃຫ້​ຕິດ​ຕັ້ງ​ບໍ​ລິ​ການ Google Play ກ່ອນ."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"​ແອັບ​ພ​ລິ​ເຄ​ຊັນ​ຕ້ອງ​ການ​ໃຫ້​ອັບ​ເດດບໍ​ລິ​ການ Google Play ກ່ອນ."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"ແອັບະ​ລິ​ເຄ​ຊັນ​ຕ້ອງ​ການ​ໃຫ້​ອັບ​ເດດ​ແອັບຯ Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"ແອັບພລິເຄຊັນຕ້ອງ​ການນຳໃຊ້ Google Play Services."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"ຮ້ອງຂໍໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"ຕິດຕັ້ງບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນໂທລະສັບຂອງທ່ານ."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ໂດຍທີ່ບໍ່ມີບໍລິການ Google Play ເຊິ່ງຂາດຫາຍໄປໃນແທັບເລັດຂອງທ່ານ."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"ຕິດຕັ້ງບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"ເປີດໃຊ້ບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ຈົນກວ່າທ່ານຈະເປີດໃຊ້ບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"ເປີດໃຊ້ບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"ອັບເດດບໍລິການ Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"​ອັບ​ເດດ Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"ແອັບຯນີ້ຈະບໍ່ສາມາດເຮັດວຽກໄດ້ຈົນກວ່າທ່ານຈະອັບເດດບໍລິການ Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"ແອັບຯ​ນີ້​ຈະ​ບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ຈົນ​ກວ່າ​ທ່ານ​ຈະ​ອັບ​ເດດ​ແອັບຯ Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ເຄືອຂ່າຍຜິດພາດ"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"ຕ້ອງໃຊ້ການເຊື່ອມຕໍ່ອິນເຕີເນັດເພື່ອໃຊ້ Google Play Services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"ບັນຊີບໍ່ຖືກຕ້ອງ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"ບັນຊີທີ່ເລືອກບໍ່ມີໃນອຸປະກອນນີ້. ກະລຸນາເລືອກບັນຊີອື່ນ."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"ມີປັນຫາທີ່ບໍ່ຄາດຄິດໃນບໍລິການ Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"ບໍລິການ Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"ບໍລິການ Google Play ທີ່ບາງແອັບພລິເຄຊັນຂອງທ່ານຕ້ອງອາໄສນັ້ນ ບໍ່ຖືກຮອງຮັບໃນອຸປະກອນຂອງທ່ານ. ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດສຳລັບການແນະນຳ."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"ອັບເດດ"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ເຂົ້າສູ່ລະບົບ"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"ເຂົ້າສູ່ລະບົບດ້ວຍ Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"​ເປີດ​ໃນ​ໂທ​ລະ​ສັບ"</string>
-</resources>
diff --git a/play-services-base/res/values-lt/common_strings.xml b/play-services-base/res/values-lt/common_strings.xml
deleted file mode 100644
index 235dad8..0000000
--- a/play-services-base/res/values-lt/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"„Google Play“ paslaugų klaida"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Norint naudoti programą būtina įdiegti „Google Play“ paslaugas."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Norint naudoti programą būtina atnaujinti „Google Play“ paslaugas."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Programai reikalingas „Android Wear“ programos naujinys."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Norint naudoti programą būtina įgalinti „Google Play“ paslaugas."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Užklausą pateikė „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Gauti „Google Play“ paslaugų"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos telefone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ši programa neveiks be „Google Play“ paslaugų, kurios neįdiegtos planšetiniame kompiuteryje."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Gauti „Google Play“ paslaugų"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Įgalinti „Google Play“ paslaugas"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ši programa neveiks, jei neįgalinsite „Google Play“ paslaugų."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Įgal. „Google Play“ paslaugas"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Atnaujinti „Google Play“ paslaugas"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Atnaujinkite „Android Wear“"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ši programa neveiks, jei neatnaujinsite „Google Play“ paslaugų."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ši programa veiks tik atnaujinus „Android Wear“ programą."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Tinklo klaida"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Norint prisijungti prie „Google Play“ paslaugų reikia duomenų ryšio."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Netinkama paskyra"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Nurodytos paskyros šiame įrenginyje nėra. Pasirinkite kitą paskyrą."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Nežinoma „Google Play“ paslaugų problema."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"„Google Play“ paslaugos"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Jūsų įrenginys nepalaiko „Google Play“ paslaugų, kuriomis remiasi kai kurios programos. Jei reikia pagalbos, susisiekite su gamintoju."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Atnaujinti"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Prisij."</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Prisij. naud. „Google“"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Atidaryti telefonu"</string>
-</resources>
diff --git a/play-services-base/res/values-lv/common_strings.xml b/play-services-base/res/values-lv/common_strings.xml
deleted file mode 100644
index 93dd0e3..0000000
--- a/play-services-base/res/values-lv/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play pakalpojumu kļūda"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Lai lietojumprogramma darbotos, jāinstalē Google Play pakalpojumi."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Lai lietojumprogramma darbotos, jāatjaunina Google Play pakalpojumi."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Lai nodrošinātu kādas lietojumprogrammas darbību, jāatjaunina lietotne Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Lai lietojumprogramma darbotos, jāiespējo Google Play pakalpojumi."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Pieprasījums no lietotnes <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play pakalpojumu iegūšana"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Lai šī lietotne darbotos, tālrunī ir jāinstalē Google Play pakalpojumi."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Lai šī lietotne darbotos, planšetdatorā ir jāinstalē Google Play pakalpojumi."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Iegūt Google Play pakalpojumus"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play pakalpojumu iespējošana"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Lai šī lietotne darbotos, iespējojiet Google Play pakalpojumus."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Iespējot Google Play pakalpojumus"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play pakalpojumu atjaunināšana"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear atjaunināšana"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Lai šī lietotne darbotos, atjauniniet Google Play pakalpojumus."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Šī lietotne nedarbosies, ja neatjaunināsiet lietotni Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Tīkla kļūda"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Lai izveidotu savienojumu ar Google Play pakalpojumiem, ir nepieciešams datu savienojums."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Nederīgs konts"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Norādītais konts šajā ierīcē nepastāv. Lūdzu, izvēlieties citu kontu."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Nezināma problēma ar Google Play pakalpojumiem."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play pakalpojumi"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Jūsu ierīce neatbalsta Google Play pakalpojumus, kuri nepieciešami dažu jūsu lietojumprogrammu darbībai. Lūdzu, sazinieties ar ražotāju, lai saņemtu palīdzību."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Atjaunināt"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Pierakst."</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Pierakstīties Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Atvērt tālrunī"</string>
-</resources>
diff --git a/play-services-base/res/values-mk-rMK/common_strings.xml b/play-services-base/res/values-mk-rMK/common_strings.xml
deleted file mode 100644
index c675f41..0000000
--- a/play-services-base/res/values-mk-rMK/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Грешка на услугите на Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Апликацијата бара да се инсталираат услугите на Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Апликацијата бара да се ажурираат услугите на Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Една апликација бара ажурирање на апликацијата Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Апликацијата бара да се овозможат услугите на Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Побарал <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Преземи ги услугите на Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Апликацијата нема да работи без услугите на Google Play, кои недостасуваат од вашиот телефон."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Апликацијата нема да работи без услугите на Google Play, кои недостасуваат од вашиот таблет."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Преземи ги услугите на Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Овозможи ги услугите на Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Апликацијата нема да работи ако не ги овозможите услугите на Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Овозможи ги услугите на Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Ажурирај ги услугите на Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Ажурирај Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Апликацијата нема да работи ако не ги ажурирате услугите на Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Апликацијата нема да работи ако не ја ажурирате апликацијата Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Мрежна грешка"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Потребно е поврзување податоци за да се поврзете со услугите на Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Неважечка сметка"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Наведената сметка не постои на овој уред. Изберете друга сметка."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Непознат проблем со услугите на Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Услуги на Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Уредот не ги поддржува услугите на Google Play на кои се потпираат некои од вашите апликации. Контактирајте со производителот за помош."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Ажурирај"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Најави се"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Најави се со Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Отвори на телефонот"</string>
-</resources>
diff --git a/play-services-base/res/values-ml-rIN/common_strings.xml b/play-services-base/res/values-ml-rIN/common_strings.xml
deleted file mode 100644
index d540d05..0000000
--- a/play-services-base/res/values-ml-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play സേവനങ്ങളിലെ പിശക്"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"ഒരു അപ്ലിക്കേഷന് Google Play സേവനങ്ങൾ ഇൻസ്‌റ്റാളുചെയ്യേണ്ടതുണ്ട്."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"ഒരു അപ്ലിക്കേഷന് Google Play സേവനങ്ങൾ അപ്‌ഡേറ്റുചെയ്യേണ്ടതുണ്ട്."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"ഒരു അപ്ലിക്കേഷന് Android Wear അപ്ലിക്കേഷനിലേക്ക് അപ്‌ഡേറ്റ് ആവശ്യമാണ്."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"ഒരു അപ്ലിക്കേഷന് Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> അഭ്യർത്ഥിച്ചത്"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play സേവനങ്ങൾ നേടുക"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"നിങ്ങളുടെ ഫോണിൽ നിന്നും നഷ്‌ടപ്പെട്ട Google Play സേവനങ്ങളില്ലാതെ ഈ അപ്ലിക്കേഷൻ പ്രവർത്തിയ്ക്കില്ല."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"നിങ്ങളുടെ ടാബ്‌‌ലെറ്റിൽ നിന്നും നഷ്‌ടപ്പെട്ട Google Play സേവനങ്ങളില്ലാതെ ഈ അപ്ലിക്കേഷൻ പ്രവർത്തിയ്ക്കില്ല."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play സേവനങ്ങൾ നേടുക"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"നിങ്ങൾ Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കിയില്ലെങ്കിൽ ഈ അപ്ലിക്കേഷൻ പ്രവർത്തിയ്ക്കില്ല."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുക"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play സേവനങ്ങൾ അപ്‌ഡേറ്റുചെയ്യുക"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear അപ്‌ഡേറ്റുചെയ്യുക"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"നിങ്ങൾ Google Play സേവനങ്ങൾ അപ്‌ഡേറ്റുചെയ്‌തില്ലെങ്കിൽ ഈ അപ്ലിക്കേഷൻ പ്രവർത്തിക്കില്ല."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"നിങ്ങൾ Android Wear അപ്ലിക്കേഷൻ അപ്‌ഡേറ്റുചെയ്യാത്തിടത്തോളം ഈ അപ്ലിക്കേഷൻ പ്രവർത്തിക്കില്ല."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"നെറ്റ്‌വർക്ക് പിശക്"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play സേവനങ്ങളിലേയ്ക്ക് കണക്റ്റുചെയ്യുന്നതിന് ഒരു ഡാറ്റ കണക്ഷൻ ആവശ്യമാണ്."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"അക്കൗണ്ട് അസാധുവാണ്"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"വ്യക്തമാക്കിയ അക്കൗണ്ട് ഈ ഉപകരണത്തിൽ നിലവിലില്ല. മറ്റൊരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play സേവനങ്ങളിലെ അജ്ഞാത പ്രശ്‌നം."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play സേവനങ്ങൾ"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"നിങ്ങളുടെ ചില അപ്ലിക്കേഷനുകൾ ആശ്രയിക്കുന്ന Google Play സേവനങ്ങളെ നിങ്ങളുടെ ഉപകരണം പിന്തുണയ്ക്കുന്നില്ല. സഹായത്തിനായി നിർമ്മാതാവിനെ ബന്ധപ്പെടുക."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"അപ്‌ഡേറ്റുചെയ്യുക"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ഫോണിൽ തുറക്കുക"</string>
-</resources>
diff --git a/play-services-base/res/values-mn-rMN/common_strings.xml b/play-services-base/res/values-mn-rMN/common_strings.xml
deleted file mode 100644
index 01556f9..0000000
--- a/play-services-base/res/values-mn-rMN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Наадаан үйлчилгээний алдаа"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Аппликешн Google Наадаан Үйлчилгээг суулгахыг шаардана."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Аппликешн Google Наадаан Үйлчилгээг шинэчлэхийг шаардана."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Аппликешнийг Андройд Зүүсгэл апп болгон шинэчлэх шаардлагатай."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Аппликешн Google Наадаан Үйлчилгээг идэвхжүүлсэн байхыг шаардана."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> хүсэлт гаргасан"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play үйлчилгээ авах"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Таны утсанд байхгүй байгаа Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Таны таблетэд байхгүй Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play үйлчилгээ авах"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play үйлчилгээг идэвхжүүлэх"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Та Google Play үйлчилгээг идэвхжүүлж байж энэ апп-г ажиллуулах боломжтой."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play үйлчилгээг идэвхжүүлэх"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play үйлчилгээг шинэчлэх"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Андройд Зүүсгэлийг шинэчлэх"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Та Google Play үйлчилгээг шинэчлэхгүй бол энэ апп ажиллах боломжгүй."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Андройд Зүүсгэл апп-г шинэчлэхээс нааш энэ апп ажиллахгүй."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Сүлжээний алдаа"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play үйлчилгээнд холбогдохын тулд дата холболт шаардлагатай."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Буруу акаунт"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Заасан акаунт энэ төхөөрөмж дээр байхгүй байна. Өөр акаунт сонгоно уу."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play үйлчилгээтэй холбоотой тодорхойгүй алдаа."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play үйлчилгээ"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Таны зарим аппликешнүүдийн хамаардаг Google Play үйлчилгээ таны төхөөрөмжид дэмжигдэхгүй байна. Тусламж авахын тулд үйлдвэрлэгчтэй холбоо барина уу."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Шинэчлэх"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Нэвтрэх"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google-р нэвтрэх:"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Утсан дээр нээх"</string>
-</resources>
diff --git a/play-services-base/res/values-mr-rIN/common_strings.xml b/play-services-base/res/values-mr-rIN/common_strings.xml
deleted file mode 100644
index d1a408e..0000000
--- a/play-services-base/res/values-mr-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play सेवा त्रुटी"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"अनुप्रयोगासाठी Google Play सेवांची स्थापना आवश्यक आहे."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"अनुप्रयोगासाठी Google Play सेवांचे अद्यतन आवश्यक आहे."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"अनुप्रयोगास Android Wear अॅप अद्यतनित करण्याची आवश्यकता आहे."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"अनुप्रयोगासाठी Google Play सेवा सक्षम केलेल्या असणे आवश्यक आहे."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारे विनंती केली"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play सेवा मिळवा"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"हा अॅप Google Play सेवांशिवाय चालणार नाही, ज्या आपल्या फोनवरून गहाळ झाल्या आहेत."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"हा अॅप Google Play सेवांशिवाय चालणार नाही, ज्या आपल्या टॅब्लेटवरून गहाळ आहेत."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play सेवा मिळवा"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play सेवा सक्षम करा"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"आपण Google Play सेवा सक्षम केल्याशिवाय हा अॅप कार्य करणार नाही."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play सेवा सक्षम करा"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play सेवा अद्यतनित करा"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear अद्यतनित करा"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"आपण Google Play सेवा अद्यतनित केल्याशिवाय हा अॅप चालणार नाही."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"आपण Android Wear अॅप अद्यतनित केल्याशिवाय हा अॅप कार्य करणार नाही."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"नेटवर्क त्रुटी"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play सेवांशी कनेक्ट होण्यासाठी डेटा कनेक्शन आवश्यक आहे."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"अवैध खाते"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"निर्दिष्ट केलेले खाते या डिव्हाइसवर अस्तित्वात नाही. कृपया एक भिन्न खाते निवडा."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play सेवांसह अज्ञात समस्या."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play सेवा"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"आपले काही अनुप्रयोग ज्यावर अवलंबून आहेत अशी, Google Play सेवा, आपल्या डिव्हाइसद्वारे समर्थित नाही. कृपया सहाय्यासाठी निर्मात्याशी संपर्क साधा."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"अद्यतनित करा"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"साइन इन करा"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google सह साइन इन करा"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"फोनवर उघडा"</string>
-</resources>
diff --git a/play-services-base/res/values-ms-rMY/common_strings.xml b/play-services-base/res/values-ms-rMY/common_strings.xml
deleted file mode 100644
index e25985b..0000000
--- a/play-services-base/res/values-ms-rMY/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Ralat perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Perkhidmatan Google Play perlu dipasang utk menggunakan aplikasi."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Perkhidmatan Google Play perlu dikemas kini utk menggunakan aplikasi."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Apl memerlukan kemas kini kepada apl Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Perkhidmatan Google Play perlu didayakan untuk menggunakan aplikasi."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Diminta oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Dapatkan perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada telefon anda."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Apl ini tidak akan berfungsi tanpa perkhidmatan Google Play dan apl ini tiada pada tablet anda."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Dapatkan perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Dayakan perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Apl ini tidak akan berfungsi kecuali anda mendayakan perkhidmatan Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Dayakan perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Kemas kini perkhidmatan Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Kemas kini Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Apl ini tidak akan berfungsi kecuali anda mengemas kini perkhidmatan Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Apl ini tidak akan berfungsi melainkan anda mengemas kini apl Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Ralat Rangkaian"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Sambungan data diperlukan untuk menyambung ke perkhidmatan Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Akaun Tidak Sah"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Akaun yang dinyatakan tidak wujud pada peranti ini. Sila pilih akaun yang lain."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Isu tidak diketahui dengan perkhidmatan Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Perkhidmatan Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Peranti anda tidak menyokong perkhidmatan Google Play, sedangkan sesetengah aplikasi anda memerlukannya. Sila hubungi pengilang untuk bantuan."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Kemas kini"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Log masuk"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Log masuk dengan Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Buka pada telefon"</string>
-</resources>
diff --git a/play-services-base/res/values-my-rMM/common_strings.xml b/play-services-base/res/values-my-rMM/common_strings.xml
deleted file mode 100644
index 1633851..0000000
--- a/play-services-base/res/values-my-rMM/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google ပလေး ဝန်ဆောင်မှုများ အမှား"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"အပလီကေးရှင်း တစ်ခု အတွက် Google ပလေး ဝန်ဆောင်မှုများကို တပ်ဆင်ပေးရန် လိုသည်။"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"အပလီကေးရှင်း တစ်ခု အတွက် Google ပလေး ဝန်ဆောင်မှုကို မွမ်းမံပေးရန် လိုသည်။"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"အပလီကေးရှင်း တစ်ခုက အန်ဒရွိုက် ဆောင်စရာ appကို မွမ်းမံပေးရန်ကို တောင်းဆိုနေသည်။"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"အပလီကေးှရင်း တစ်ခု အတွက် Google ပလေး ဝန်ဆောင်မှုကို ဖွင့်ပေးရန် လိုအပ်သည်။"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> က တောင်းဆိုခဲ့သည်"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google ပလေး ဝန်ဆောင်မှုများကို ရယူပါ။"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ဤappသည် သင့်ဖုန်းထဲတွင် မရှိသည့် Google ပလေး ဝန်ဆောင်မှုများ မရှိလျှင် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"သင် တက်ဘလက် ထဲတွင် မရှိသည့် Google ပလေး ဝန်ဆောင်မှုများ မရှိလျှင် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google ပလေး ဝန်ဆောင်မှုများကို ရယူရန်"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google ပလေး ၀န်ဆောင်မှုများ ဖွင့်ရန်"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"သင်က Google ပလေး ဝန်ဆောင်မှုများ မဖွင့်သရွေ့  ဤapp အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google ပလေး ၀န်ဆောင်မှုများ ဖွင့်ရန်"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google ပလေး ၀န်ဆောင်မှုများကို မွမ်းမံရန်"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"အန်ဒရွိုက် ဆောင်စရာကို မွမ်းမံရန်"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"သင်သည် Google ပလေး ဝန်ဆောင်မှုများကို မမွမ်းမံသရွေ့ ဤ app အလုပ် လုပ်မည် မဟုတ်ပါ။"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"သင်က အန်ဒရွိုက် ဆောင်စရာ appကို မွမ်းမံ မပေးမချင်း ဒီapp အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ကွန်ရက် အမှား"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google ပလေး ဝန်ဆောင်မှုများသို့ ဆက်သွယ်ရန် ဒေတာ ချိတ်ဆက်မှု လိုအပ်သည်။"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"မမှန်သည့် အကောင့်"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"ဤကိရိယာမှာ ဖေါ်ပြပါ အကောင့်မရှိပါ။ ကျေးဇူးပြု၍ အခြား အကောင့်ကို ရွေးပါ။"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google ပလေး ဝန်ဆောင်မှုတွင် မသိရ ပြဿနာ ရှိနေသည်။"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google ပလေး ဝန်ဆောင်မှုများ"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"သင်၏ အပလီကေးရှင်း အချို့က အားကိုးကြသည့် Google ပလေး ဝန်ဆောင်မှုများကို  သင်၏ ကိရိယာက မပံ့ပိုးပါ။ အကူအညီရယူရန် ကျေးဇူးပြုပြီး ထုတ်လုပ်သူကို ဆက်သွယ်ပါ။"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"မွမ်းမံရန်"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"လင်မှတ်ထိုး ဝင်"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google ဖြင့် လက်မှတ်ထို ဝင်"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ဖုန်းထဲ ဖွင့်ရန်"</string>
-</resources>
diff --git a/play-services-base/res/values-nb/common_strings.xml b/play-services-base/res/values-nb/common_strings.xml
deleted file mode 100644
index 646f094..0000000
--- a/play-services-base/res/values-nb/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play Tjenester-feil"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"En app krever installasjon av Google Play Tjenester."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"En app krever at Google Play Tjenester oppdateres."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"En app krever en oppdatering av Android Wear-appen."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"En app krever Google Play Tjenester for å aktiveres."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Forespurt av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Installer Google Play Tjenester"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på telefonen din."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Denne appen kan ikke kjøres uten Google Play Tjenester, som ikke er installert på nettbrettet ditt."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Installer Google Play Tjenester"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktiver Google Play Tjenester"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Denne appen fungerer ikke med mindre du aktiverer Google Play Tjenester."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktiver Google Play Tjenester"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Oppdater Google Play Tjenester"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Oppdater Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Denne appen kan ikke kjøres før du oppdaterer Google Play Tjenester."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Denne appen kjører ikke med mindre du oppdaterer Android Wear-appen."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Nettverksfeil"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Du må ha datatilkobling for å koble deg til Google Play-tjenester."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ugyldig konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Den angitte kontoen finnes ikke på enheten. Velg en annen konto."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Det oppsto et ukjent problem med Google Play Tjenester."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-tjenester"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play Tjenester, som noen av appene er avhengige av, støttes ikke av enheten. Ta kontakt med produsenten for å få hjelp."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Oppdater"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Logg på"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Logg inn med Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Åpne på telefonen"</string>
-</resources>
diff --git a/play-services-base/res/values-ne-rNP/common_strings.xml b/play-services-base/res/values-ne-rNP/common_strings.xml
deleted file mode 100644
index 5b3d605..0000000
--- a/play-services-base/res/values-ne-rNP/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play सेवाहरूका त्रुटि"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Google Play सेवाहरू स्थापना गर्न अनुप्रयोग आवश्यक हुन्छ।"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Google Play सेवाहरू अद्यावधिक गर्न अनुप्रयोग आवश्यक हुन्छ।"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android उपयोग अनुप्रयोग लाई अद्यावधिक गर्न एक अनुप्रयोगको आवश्यक छ।"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Google Play का सेवाहरू सक्षम गर्न अनुप्रयोग आवश्यक हुन्छ।"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारा अनुरोध गरियो"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play सेवाहरू प्राप्त गर्नुहोस्"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"यो अनुप्रयोग Google Play सेवाहरू बिना चल्दैन जुन तपाईँको फोनमा छैन।"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"यो अनुप्रयोग Google Play सेवाहरू बिना चल्दैन जुन तपाईँको ट्याब्लेटमा छैन।"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play सेवाहरू प्राप्त गर्नुहोस्"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play सेवाहरू सक्षम पार्नुहोस्"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"तपाईँले Google Play सेवाहरूलाई सक्षम नपारेसम्म यस अनुप्रयोगले काम गर्दैन।"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play सेवाहरू सक्षम पार्नुहोस्"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play सेवाहरू अद्यावधिक गर्नुहोस्"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android उपयोग अद्यावधिक गर्नुहोस्"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"तपाईँले Google Play सेवाहरू अद्यावधिक नगरेसम्म यो अनुप्रयोग चल्ने छैन।"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android उपयोग अनुप्रयोग अद्यावधिक नगरेसम्म यो अनुप्रयोगले कार्य गर्ने छैन।"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"नेटवर्क त्रुटि"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"एउटा डेटा जडान Google प्ले सेवाहरूसँग जडित गर्न आवश्यकता छ।"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"अमान्य खाता"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"निर्दिष्ट खाता यो उपकरणमा छैन। कृपया एउटा अलग खाता चयन गर्नुहोस्।"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play सेवाहरूको अज्ञात सवाल"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play सेवाहरू"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play सेवाहरूसँग भर पर्ने केही तपाईँका अनुप्रयोगहरू तपाईँको उपकरणले समर्थन गर्दैन। कृपया सहयोगका लागि निमार्तासँग सम्पर्क गर्नुहोस्।"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"अद्यावधिक गर्नुहोस्"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"साइन इन गर्नुहोस्"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"गुगलका साथ साइन इन गर्नुहोस्"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"फोनमा खोल्नुहोस्"</string>
-</resources>
diff --git a/play-services-base/res/values-nl/common_strings.xml b/play-services-base/res/values-nl/common_strings.xml
deleted file mode 100644
index 653e408..0000000
--- a/play-services-base/res/values-nl/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Fout met Google Play-services"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Google Play-services moet zijn geïnstalleerd voor een app."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Google Play-services moet worden geüpdatet voor een app."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Er is een update van de Android Wear-app vereist voor een bepaalde app."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Google Play-services moet zijn ingeschakeld voor een app."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Aangevraagd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play-services ophalen"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw telefoon."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Deze app kan niet worden uitgevoerd zonder Google Play-services die ontbreken op uw tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play-services ophalen"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play-services inschakelen"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Deze app werkt niet, tenzij u Google Play-services inschakelt."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play-services inschak."</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play-services updaten"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear bijwerken"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Deze app kan niet worden uitgevoerd, tenzij u Google Play-services updatet."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Deze app wordt niet uitgevoerd, tenzij u de Android Wear-app bijwerkt."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Netwerkfout"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Er is een gegevensverbinding nodig om verbinding te kunnen maken met Google Play-services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ongeldig account"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Het gespecificeerde account bestaat niet op dit apparaat. Kies een ander account."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Onbekend probleem met Google Play-services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play-services, dat vereist is voor een aantal van uw applicaties, wordt niet ondersteund door uw apparaat. Neem contact op met de fabrikant voor ondersteuning."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Updaten"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Inloggen"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Inloggen met Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Openen op telefoon"</string>
-</resources>
diff --git a/play-services-base/res/values-pl/common_strings.xml b/play-services-base/res/values-pl/common_strings.xml
deleted file mode 100644
index 20d687a..0000000
--- a/play-services-base/res/values-pl/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Błąd Usług Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikacja wymaga zainstalowania Usług Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikacja wymaga zaktualizowania Usług Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Aplikacja wymaga aktualizacji do Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikacja wymaga włączenia Usług Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Żądanie z aplikacji <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Pobierz Usługi Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na telefonie."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ta aplikacja nie będzie działać bez Usług Google Play, których nie masz na tablecie."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Pobierz Usługi Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Włącz Usługi Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ta aplikacja nie będzie działać, jeśli nie włączysz Usług Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Włącz Usługi Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Aktualizuj Usługi Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Zaktualizuj Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ta aplikacja nie będzie działać, jeśli nie zaktualizujesz Usług Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ta aplikacja nie będzie działać, jeśli nie zaktualizujesz aplikacji Google Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Błąd sieci"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Korzystanie z usług Google Play wymaga połączenia z internetem."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Nieprawidłowe konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Podanego konta nie ma na tym urządzeniu. Wybierz inne konto."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Nieznany problem z Usługami Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Usługi Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Usługi Google Play, od których zależy działanie niektórych aplikacji, nie są obsługiwane na Twoim urządzeniu. Skontaktuj się z producentem, by uzyskać pomoc."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Aktualizuj"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Zaloguj się"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Zaloguj się przez Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Otwórz na telefonie"</string>
-</resources>
diff --git a/play-services-base/res/values-pt-rBR/common_strings.xml b/play-services-base/res/values-pt-rBR/common_strings.xml
deleted file mode 100644
index 8c0b573..0000000
--- a/play-services-base/res/values-pt-rBR/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erro do Google Play Services"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Um app requer a instalação do Google Play Services."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Um app requer a atualização do Google Play Services."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Um app exige uma atualização do app Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Um app requer a ativação do Google Play Services."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Instale o Google Play Services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Este app não funciona sem o Google Play Services, que não está instalado em seu telefone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Este app não funciona sem o Google Play Services, que não está instalado em seu tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Instalar o Google Play Services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Ative o Google Play Services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Este app só funciona com o Google Play Services ativado."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Ativar o Google Play Services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Atualize o Google Play Services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Atualizar o Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Este app só funciona com uma versão atualizada do Google Play Services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Este app só funciona com uma versão atualizada do app Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erro na rede"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"É necessária uma conexão de dados para conectar ao Google Play Services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Conta inválida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"A conta especificada não existe no dispositivo. Escolha outra conta."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problema desconhecido com o Google Play Services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Play Services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"O Google Play Services, necessário para alguns dos apps, não é compatível com seu dispositivo. Entre em contato com o fabricante para obter assistência."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Atualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Login"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Fazer login com o Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir no smartphone"</string>
-</resources>
diff --git a/play-services-base/res/values-pt-rPT/common_strings.xml b/play-services-base/res/values-pt-rPT/common_strings.xml
deleted file mode 100644
index 7c1a601..0000000
--- a/play-services-base/res/values-pt-rPT/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erro dos Serviços do Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Uma aplicação necessita da instalação dos Serviços do Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Uma aplicação necessita da atualização dos Serviços do Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Uma aplicação requer uma atualização da aplicação Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Uma aplicação necessita da ativação dos Serviços do Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Pedida por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Obter serviços do Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu telemóvel."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Esta aplicação não será executada sem os serviços do Google Play, que estão em falta no seu tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Obter serviços do Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Ativar serviços do Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Esta aplicação não funcionará enquanto não ativar os serviços do Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Ativar serviços do Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Atualizar serviços do Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Atualizar Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Esta aplicação não será executada enquanto não atualizar os serviços do Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Esta aplicação não será executada enquanto não atualizar a aplicação Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erro de Rede"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"É necessária uma ligação de dados para se ligar aos Serviços do Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Conta Inválida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"A conta especificada não existe neste dispositivo. Escolha uma conta diferente."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problema desconhecido nos serviços do Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Serviços do Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Os serviços do Google Play, dos quais dependem algumas das suas aplicações, não são suportados pelo seu dispositivo. Contacte o fabricante para obter assistência."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Atualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Inic. ses."</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Inic. sessão com o Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir no telemóvel"</string>
-</resources>
diff --git a/play-services-base/res/values-pt/common_strings.xml b/play-services-base/res/values-pt/common_strings.xml
deleted file mode 100644
index 8c0b573..0000000
--- a/play-services-base/res/values-pt/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Erro do Google Play Services"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Um app requer a instalação do Google Play Services."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Um app requer a atualização do Google Play Services."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Um app exige uma atualização do app Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Um app requer a ativação do Google Play Services."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Instale o Google Play Services"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Este app não funciona sem o Google Play Services, que não está instalado em seu telefone."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Este app não funciona sem o Google Play Services, que não está instalado em seu tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Instalar o Google Play Services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Ative o Google Play Services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Este app só funciona com o Google Play Services ativado."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Ativar o Google Play Services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Atualize o Google Play Services"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Atualizar o Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Este app só funciona com uma versão atualizada do Google Play Services."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Este app só funciona com uma versão atualizada do app Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Erro na rede"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"É necessária uma conexão de dados para conectar ao Google Play Services."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Conta inválida"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"A conta especificada não existe no dispositivo. Escolha outra conta."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problema desconhecido com o Google Play Services."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Play Services"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"O Google Play Services, necessário para alguns dos apps, não é compatível com seu dispositivo. Entre em contato com o fabricante para obter assistência."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Atualizar"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Login"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Fazer login com o Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Abrir no smartphone"</string>
-</resources>
diff --git a/play-services-base/res/values-ro/common_strings.xml b/play-services-base/res/values-ro/common_strings.xml
deleted file mode 100644
index b75f231..0000000
--- a/play-services-base/res/values-ro/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Eroare a serviciilor Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"O aplicație necesită instalarea serviciilor Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"O aplicație necesită o actualizare pentru serviciile Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"O aplicație necesită actualizarea aplicației Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"O aplicație necesită activarea serviciilor Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Solicitată de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Descărcaţi Servicii Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe telefon."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Această aplicaţie nu poate rula fără Servicii Google Play, care lipsesc de pe tabletă."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Obţineţi Servicii Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Activaţi Servicii Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Această aplicaţie nu va funcţiona decât dacă activaţi Servicii Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Activaţi Servicii Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Actualizaţi Servicii Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Actualizați Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Această aplicaţie nu poate rula decât dacă actualizaţi Servicii Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Această aplicație nu va rula dacă nu actualizați aplicația Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Eroare de reţea"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Este necesară o conexiune de date pentru a vă conecta la serviciile Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Cont nevalid"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Contul menționat nu există pe acest dispozitiv. Alegeți alt cont."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Problemă necunoscută privind Servicii Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Servicii Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Gadgetul nu acceptă serviciile Google Play, pe care se bazează unele dintre aplicații. Pentru asistență, contactați producătorul gadgetului."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Actualizaţi"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Conectați"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Conectați-vă cu Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Deschideți pe telefon"</string>
-</resources>
diff --git a/play-services-base/res/values-ru/common_strings.xml b/play-services-base/res/values-ru/common_strings.xml
deleted file mode 100644
index 6aab49f..0000000
--- a/play-services-base/res/values-ru/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Ошибка сервисов Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Для работы приложения требуется установить сервисы Google Play"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Для работы приложения требуется обновить сервисы Google Play"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Требуется обновить приложение Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Для работы приложения требуется включить сервисы Google Play"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Источник запроса: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Установите Сервисы Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Для работы этого приложения требуется установить Сервисы Google Play."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Для работы этого приложения требуется установить Сервисы Google Play."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Установить"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Включите Сервисы Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Для работы этого приложения требуется включить Сервисы Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Включить"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Обновите Сервисы Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Обновить Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Для работы этого приложения требуется обновить Сервисы Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Для работы этого приложения требуется обновить Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Ошибка сети"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Для работы с Google Play требуется подключение к сети."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Недействительный аккаунт"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Этого аккаунта нет на устройстве. Выберите другой."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Неизвестная ошибка с Сервисами Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Сервисы Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Сервисы Google Play, необходимые для работы некоторых приложений, не поддерживаются на вашем устройстве. Обратитесь к производителю."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Обновить"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Войти"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Войти в аккаунт Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Открыть на телефоне"</string>
-</resources>
diff --git a/play-services-base/res/values-si-rLK/common_strings.xml b/play-services-base/res/values-si-rLK/common_strings.xml
deleted file mode 100644
index 2ddf0ff..0000000
--- a/play-services-base/res/values-si-rLK/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play සේවා දෝෂය"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"යෙදුමකට Google Play සේවා ස්ථාපනයක් අවශ්‍යය."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"යෙදුමකට Google Play සේවාවන් සඳහා යාවත්කාලීනයක් අවශ්‍යය."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android Wear යෙදුම යාවත්කාලීන කිරීමට යෙදුමක් අවශ්‍යය."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"යෙදුමකට Google Play සේවාවන් සබලව තිබීම අවශ්‍යය."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> විසින් ඉල්ලා ඇත"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play සේවාවන් ලබා ගන්න"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ඔබගේ දුරකථනයෙන් අස්ථානගත වී ඇති Google Play සේවාවන් රහිතව මෙම යෙදුම ධාවනය නොවනු ඇත."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ඔබගේ ටැබ්ලටයෙන් අස්ථානගත වී ඇති Google Play සේවාවන් රහිතව මෙම යෙදුම ධාවනය නොවේ."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play සේවාවන් ලබා ගන්න"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play සේවාවන් සබල කරන්න"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"ඔබ Google Play සේවාවන් සබල කරන්නේ නම් මිස මෙම යෙදුම වැඩ නොකරනු ඇත."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play සේවාවන් සබල කරන්න"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play සේවාවන් යාවත්කාලීන කරන්න"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear යාවත්කාලීන කරන්න"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"ඔබ Google Play සේවා යාවත්කාලීන කරන්නේ නම් මිස මෙම යෙදුම ධාවනය නොවේ."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android Wear යෙදුම ඔබ යාවත්කාලීන කළේ නැති නම් මෙම යෙදුම ධාවනය කළ නොහැක."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ජාල දෝෂය"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play සේවාවන් වෙත සබැඳීමට දත්ත සබැඳුමක් අවශ්‍යය."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"වලංගු නොවන ගිණුම"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"නියම කර දැක්වූ ගිණුම මෙම උපාංගය මත නොපවතී. කරුණාකර වෙනත් ගිණුමක් තෝරන්න."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play සේවාවන් සමග නොදන්නා ගැටලුවක්."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play සේවා"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"ඔබගේ සමහර යෙදුම් විශ්වාසය තබන, Google Play සේවාවන්ට, ඔබගේ උපාංගය සහාය නොදක්වයි. කරුණාකර සහාය සඳහා නිෂ්පාදකයා අමතන්න."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"යාවත්කාලීන කරන්න"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"පිවිසෙන්න"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google සමගින් පුරනය වන්න"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"දුරකථනය තුළ විවෘත කරන්න"</string>
-</resources>
diff --git a/play-services-base/res/values-sk/common_strings.xml b/play-services-base/res/values-sk/common_strings.xml
deleted file mode 100644
index a44a4bf..0000000
--- a/play-services-base/res/values-sk/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Chyba služieb Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Aplikácia vyžaduje inštaláciu služieb Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Aplikácia vyžaduje aktualizáciu služieb Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Niektorá aplikácia vyžaduje aktualizáciu aplikácie Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Aplikácia vyžaduje povolenie služieb Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Vyžiadané aplikáciou <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Inštalovať služby Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v telefóne nemáte."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Na spustenie tejto aplikácie sa vyžadujú služby Google Play, ktoré v tablete nemáte."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Inštalovať služby Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Povoliť služby Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Táto aplikácia bude fungovať až po povolení služieb Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Povoliť služby Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Aktualizovať služby Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Aktualizujte aplikáciu Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Túto aplikáciu bude možné spustiť až po aktualizácii služieb Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Táto aplikácia bude fungovať až po aktualizácii aplikácie Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Chyba siete"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Pripojenie k službám Google Play si vyžaduje dátové pripojenie."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Neplatný účet"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Zadaný účet v tomto zariadení neexistuje. Vyberte iný účet."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Neznámy problém so službami Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Služby Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Niektoré vaše aplikácie vyžadujú služby Google Play, ktoré vo vašom zariadení nie sú podporované. Ak potrebujete pomoc, kontaktujte výrobcu."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Aktualizovať"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Prihlásiť sa"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Prihlásiť sa do účtu Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Otvoriť na telefóne"</string>
-</resources>
diff --git a/play-services-base/res/values-sl/common_strings.xml b/play-services-base/res/values-sl/common_strings.xml
deleted file mode 100644
index 1af1f02..0000000
--- a/play-services-base/res/values-sl/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Napaka storitev Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Za delovanje aplikacije morate namestiti storitve Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Za delovanje aplikacije morate posodobiti storitve Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Aplikacija zahteva posodobitev aplikacije Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Za delovanje aplikacije morate omogočiti storitve Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Zahteva aplikacije <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Namestite storitve Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v telefonu."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ta aplikacija ne deluje brez storitev Google Play, ki jih ni v tabličnem računalniku."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Namestite storitve Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Omogočite storitve Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Aplikacija ne bo delovala, če ne omogočite storitev Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Omogočite storitve Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Posodobite storitve Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Posodobitev aplikacije Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ta aplikacija ne deluje, če ne posodobite storitev Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ta aplikacije ne deluje, če ne posodobite aplikacije Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Omrežna napaka"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Za povezavo s storitvami Google Play potrebujete internetno povezavo."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Neveljaven račun"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"V tej napravi ne obstaja navedeni račun. Izberite drugega."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Neznana težava s storitvami Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Storitve Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Vaša naprava na podpira storitev Google Play, ki jih potrebujejo nekatere od vaših aplikacij. Za pomoč se obrnite na izdelovalca."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Posodobi"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Prijava"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Prijavite se v Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Odpiranje v telefonu"</string>
-</resources>
diff --git a/play-services-base/res/values-sr/common_strings.xml b/play-services-base/res/values-sr/common_strings.xml
deleted file mode 100644
index c6d6976..0000000
--- a/play-services-base/res/values-sr/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Грешка Google Play услуга"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Апликација захтева инсталацију Google Play услуга."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Апликација захтева ажурирање Google Play услуга."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Апликација захтева ажурирање апликације Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Апликација захтева да Google Play услуге буду омогућене."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Захтева <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Преузимање Google Play услуга"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ова апликација не може да се покрене без Google Play услуга, које недостају на телефону."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ова апликација не може да се покрене без Google Play услуга, које недостају на таблету."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Преузми Google Play услуге"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Омогућавање Google Play услуга"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ова апликација неће функционисати ако не омогућите Google Play услуге."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Омогући Google Play услуге"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Ажурирање Google Play услуга"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Ажурирајте Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ова апликација не може да се покрене ако не ажурирате Google Play услуге."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ова апликација не може да се покрене ако не ажурирате апликацију Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Грешка на мрежи"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"За повезивање са Google Play услугама потребна је веза за пренос података."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Неважећи налог"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Наведени налог не постоји на овом уређају. Одаберите други налог."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Непознат проблем са Google Play услугама."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play услуге"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Google Play услуге, које су потребне за функционисање неких од апликација, нису подржане на уређају. Контактирајте произвођача да бисте добили помоћ."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Ажурирај"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Пријави ме"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Пријави ме преко Google-а"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Отвори на телефону"</string>
-</resources>
diff --git a/play-services-base/res/values-sv/common_strings.xml b/play-services-base/res/values-sv/common_strings.xml
deleted file mode 100644
index 22e459c..0000000
--- a/play-services-base/res/values-sv/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Fel på Google Play-tjänster"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Google Play-tjänster måste installeras för att en app ska fungera."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Google Play-tjänster måste uppdateras för en app ska fungera."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"En app kräver att appen Android Wear uppdateras."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Google Play-tjänster måste aktiveras för att en app ska fungera."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Begärdes av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Hämta Google Play Tjänster"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Den här appen kan inte köras utan Google Play Tjänster, som saknas på mobilen."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Den här appen kan inte köras utan Google Play Tjänster, som saknas på surfplattan."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Hämta Google Play Tjänster"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Aktivera Google Play Tjänster"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Du måste aktivera Google Play Tjänster för att den här appen ska fungera."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Aktivera Google Play Tjänster"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Uppdatera Google Play Tjänster"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Uppdatera Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Du måste uppdatera Google Play Tjänster innan du kan köra den här appen."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Om du inte uppdaterar appen Android Wear kan den här appen inte köras."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Nätverksfel"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"En dataanslutning krävs för att ansluta till Google Plays tjänster."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Ogiltigt konto"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Det angivna kontot finns inte på den här enheten. Välj ett annat konto."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Okänt problem med Google Play Tjänster"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play-tjänster"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Några av dina appar använder Google Play-tjänster som inte stöds av din enhet. Kontakta tillverkaren om du vill ha hjälp."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Uppdatera"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Logga in"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Logga in med Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Öppna på mobilen"</string>
-</resources>
diff --git a/play-services-base/res/values-sw/common_strings.xml b/play-services-base/res/values-sw/common_strings.xml
deleted file mode 100644
index 982eb4a..0000000
--- a/play-services-base/res/values-sw/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Hitilafu kwenye huduma za Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Programu inahitaji usakinishaji wa huduma za Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Programu inahitaji toleo jipya la huduma za Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Programu inahitaji sasisho kwa programu ya Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Programu inahitaji huduma za Google Play ili iwashwe."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Imeombwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Pata huduma za Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Programu hii haiwezi kuendeshwa bila huduma za Google Play, ambazo hazipo kwenye simu yako."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Programu hii haiwezi kufanya kazi bila huduma za Google Play, ambazo hazipatikani kwenye kompyuta kibao yako."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Pata huduma za Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Wezesha huduma za Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Programu hii haitafanya kazi mpaka utakapowezesha huduma za Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Wezesha huduma za Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Sasisha huduma za Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Sasisha Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Programu hii haiwezi kuendeshwa mpaka utakaposasisha huduma za Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Programu hii haitaendeshwa usiposasisha programu ya Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Hitilafu ya Mtandao"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Muunganisho wa data unahitajika ili kuunganisha kwenye huduma za Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Akaunti Batili"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Akaunti iliyobainishwa haipo kwenye kifaa hiki. Tafadhali chagua akaunti tofauti."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Suala lisilojulikana na huduma za Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Huduma za Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Huduma za Google Play, ambazo baadhi ya programu zako zinategemea, si linganifu na kifaa chako. Tafadhali wasiliana na mtengenezaji kwa usaidizi."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Sasisha"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Ingia"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Ingia ukitumia Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Fungua kwenye simu"</string>
-</resources>
diff --git a/play-services-base/res/values-ta-rIN/common_strings.xml b/play-services-base/res/values-ta-rIN/common_strings.xml
deleted file mode 100644
index f026b82..0000000
--- a/play-services-base/res/values-ta-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play சேவைகள் பிழை"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"பயன்பாடானது Google Play சேவைகள் நிறுவ கேட்கிறது."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"பயன்பாடானது Google Play சேவைகளுக்கான புதுப்பிப்பைக் கேட்கிறது."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Android வியருக்குப் பயன்பாட்டைப் புதுப்பிக்க வேண்டும்."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"பயன்பாடானது Google Play சேவைகள் இயக்கக் கேட்கிறது."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> ஆல் கோரப்பட்டது"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play சேவைகளைப் பெறுக"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"உங்கள் தொலைபேசியில் இல்லாத Google Play சேவைகள் இல்லாமல் இந்தப் பயன்பாடு இயங்காது."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"உங்கள் டேப்லெட்டில் இல்லாத Google Play சேவைகள் இல்லாமல் இந்தப் பயன்பாடு இயங்காது."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play சேவைகளைப் பெறுக"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play சேவைகளை இயக்கு"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"நீங்கள் Google Play சேவைகளை இயக்கும்வரை இந்தப் பயன்பாடு வேலை செய்யாது."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play சேவைகளை இயக்கு"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play சேவைகளைப் புதுப்பி"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android வியரைப் புதுப்பி"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"நீங்கள் Google Play சேவைகளைப் புதுப்பிக்கும்வரை இந்தப் பயன்பாடு இயங்காது."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android வியருக்குப் புதுப்பிக்கும் வரை, பயன்பாடு செயல்படாது."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"பிணைய பிழை"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play சேவைகளில் இணைக்க தரவு இணைப்பு தேவை."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"தவறான கணக்கு"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"இந்தச் சாதனத்தில் குறிப்பிடப்பட்ட கணக்கு இல்லை. வேறு கணக்கைத் தேர்வு செய்யவும்."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play சேவைகளில் அறியப்படாத சிக்கல் உள்ளது."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play சேவைகள்"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"உங்கள் பயன்பாடுகளில் சில சார்ந்துள்ள Google Play சேவைகளை உங்கள் சாதனம் ஆதரிக்கவில்லை. உதவிக்கு உற்பத்தியாளரைத் தொடர்புகொள்ளவும்."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"புதுப்பி"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"உள்நுழைக"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google மூலம் உள்நுழை"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ஃபோனில் திற"</string>
-</resources>
diff --git a/play-services-base/res/values-te-rIN/common_strings.xml b/play-services-base/res/values-te-rIN/common_strings.xml
deleted file mode 100644
index b680d4c..0000000
--- a/play-services-base/res/values-te-rIN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play సేవల లోపం"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"ఒక అనువర్తనానికి Google Play సేవల యొక్క ఇన్‌స్టాలేషన్ అవసరం."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"ఒక అనువర్తనానికి Google Play సేవలు నవీకరించబడటం అవసరం."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"ఒక అనువర్తనానికి Android Wear అనువర్తనాన్ని నవీకరించడం అవసరం."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"ఒక అనువర్తనానికి Google Play సేవలు ప్రారంభించబడాలి."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా అభ్యర్థించబడింది"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play సేవలను పొందండి"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"ఈ అనువర్తనం Google Play సేవలు లేకుండా అమలు కాదు, ఆ సేవలు మీ ఫోన్‌లో లేవు."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"ఈ అనువర్తనం Google Play సేవలు లేకుండా అమలు కాదు, ఆ సేవలు మీ టాబ్లెట్‌లో లేవు."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play సేవలను పొందండి"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play సేవలను ప్రారంభించు"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"మీరు Google Play సేవలను ప్రారంభిస్తే మినహా ఈ అనువర్తనం పని చేయదు."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play సేవలను ప్రారంభించు"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play సేవలను నవీకరించండి"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wearని నవీకరించండి"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"మీరు Google Play సేవలను నవీకరిస్తే మినహా ఈ అనువర్తనం అమలు కాదు."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"మీరు Android Wear అనువర్తనాన్ని నవీకరించకపోతే ఈ అనువర్తనం అమలు కాదు."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"నెట్‌వర్క్ లోపం"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play సేవలకు కనెక్ట్ చేయడానికి డేటా కనెక్షన్ అవసరం."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"చెల్లని ఖాతా"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"పేర్కొన్న ఖాతా ఈ పరికరంలో లేదు. దయచేసి వేరొక ఖాతాను ఎంచుకోండి."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play సేవలతో తెలియని సమస్య."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play సేవలు"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"మీ అనువర్తనాల్లో కొన్ని ఆధారపడే Google Play సేవలకు మీ పరికరంలో మద్దతు లేదు. దయచేసి సహాయం కోసం తయారీదారును సంప్రదించండి."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"నవీకరించు"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"సైన్ ఇన్ చేయి"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Googleతో సైన్ ఇన్ చేయి"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"ఫోన్‌లో తెరవండి"</string>
-</resources>
diff --git a/play-services-base/res/values-th/common_strings.xml b/play-services-base/res/values-th/common_strings.xml
deleted file mode 100644
index 00d3654..0000000
--- a/play-services-base/res/values-th/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"ข้อผิดพลาดของบริการ Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"แอปพลิเคชันหนึ่งจำเป็นต้องมีการติดตั้งบริการ Google Play"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"แอปพลิเคชันหนึ่งจำเป็นต้องมีการอัปเดตสำหรับบริการ Google Play"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"แอปพลิเคชันรายการหนึ่งต้องการให้อัปเดตแอป Android Wear"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"แอปพลิเคชันหนึ่งจำเป็นต้องมีบริการ Google Play เพื่อเปิดใช้งาน"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"ขอโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"รับบริการ Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในโทรศัพท์ของคุณ"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"แอปพลิเคชันนี้จะไม่ทำงานหากไม่มีบริการ Google Play ซึ่งไม่มีในแท็บเล็ตของคุณ"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"รับบริการ Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"เปิดใช้งานบริการ Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"แอปพลิเคชันนี้จะไม่ทำงานจนกว่าคุณจะเปิดใช้งานบริการ Google Play"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"เปิดใช้งานบริการ Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"อัปเดตบริการ Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"อัปเดต Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"แอปพลิเคชันนี้จะไม่ทำงานจนกว่าคุณจะอัปเดตบริการ Google Play"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"แอปนี้จะไม่ทำงานจนกว่าคุณจะอัปเดตแอป Android Wear"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"ข้อผิดพลาดของเครือข่าย"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"ต้องมีการเขื่อมต่อข้อมูลเพื่อเชื่อมต่อกับบริการ Google Play"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"บัญชีไม่ถูกต้อง"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"บัญชีที่ระบุไม่มีอยู่บนอุปกรณ์นี้ โปรดเลือกบัญชีอื่น"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"ปัญหาที่ไม่รู้จักของบริการ Google Play"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"บริการ Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"บริการ Google Play ซึ่งใช้งานในบางแอปพลิเคชัน ไม่ได้รับการสนับสนุนโดยอุปกรณ์ของคุณ โปรดติดต่อผู้ผลิตเพื่อขอรับความช่วยเหลือ"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"อัปเดต"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"ลงชื่อใช้"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"ลงชื่อเข้าใช้ด้วย Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"เปิดบนโทรศัพท์"</string>
-</resources>
diff --git a/play-services-base/res/values-tl/common_strings.xml b/play-services-base/res/values-tl/common_strings.xml
deleted file mode 100644
index 1453c64..0000000
--- a/play-services-base/res/values-tl/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Error sa Mga Serbisyo ng Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Kailangan ng application na i-install ang Mga Serbisyo ng Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Kailangan ng application ng update sa Mga Serbisyo ng Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Ang isang application ay nangangailangan ng update sa Android Wear app."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Kailangan ng application na na-enable ang Mga Serbisyo ng Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Hiniling ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Kumuha ng mga serbisyo ng Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Hindi tatakbo ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong telepono."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Hindi gagana ang app na ito nang wala ang mga serbisyo ng Google Play, na wala sa iyong tablet."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Kumuha ng Google Play services"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Paganahin ang Google Play services"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Hindi gagana ang app na ito maliban kung papaganahin mo ang mga serbisyo ng Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Enable Google Play services"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"I-update ang mga serbisyo ng Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"I-update ang Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Hindi gagana ang app na ito maliban kung i-a-update mo ang mga serbisyo ng Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Hindi gagana ang app na ito hanggang sa i-update mo ang Android Wear app."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"May Error sa Network"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Kailangan ng koneksyon ng data upang makakonekta sa mga serbisyo ng Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Di-wasto ang Account"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Hindi umiiral ang tinukoy na account sa device na ito. Mangyaring pumili ng ibang account."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"May hindi alam na isyu sa mga serbisyo ng Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Mga serbisyo ng Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Ang mga serbisyo ng Google Play, kung saan nakadepende ang ilan sa iyong mga application, ay hindi sinusuportahan ng iyong device. Mangyaring makipag-ugnay sa manufacturer para sa tulong."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"I-update"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Sign in"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Mag-sign in sa Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Buksan sa telepono"</string>
-</resources>
diff --git a/play-services-base/res/values-tr/common_strings.xml b/play-services-base/res/values-tr/common_strings.xml
deleted file mode 100644
index 74c15b8..0000000
--- a/play-services-base/res/values-tr/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play Hizmetleri hatası"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Bir uygulama, Google Play hizmetlerinin yüklenmesini gerektiriyor."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Bir uygulama, Google Play Hizmetleri için bir güncelleme gerektiriyor."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Bir uygulama, Android Wear uygulamasında güncelleme yapılmasını gerektiriyor."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Bir uygulama, Google Play Hizmetleri\'nin etkin olmasını gerektiriyor."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"İstekte bulunan: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play hizmetlerini edinin"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Google Play Hizmetleri telefonunuzda yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Google Play Hizmetleri tabletinizde yok ve bu uygulama Google Play Hizmetleri olmadan çalışmaz."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play hizmetlerini edin"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play hizmetlerini etkinleştir"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Bu uygulama, Google Play Hizmetleri etkinleştirilmeden çalışmaz"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play hizmetlerini etkinleştir"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play hizmetlerini güncelle"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear\'ı Güncelle"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Bu uygulama Google Play Hizmetleri güncellenmeden çalışmaz."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Android Wear uygulaması güncelleninceye kadar bu uygulama çalışmayacak."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Ağ Hatası"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play hizmetlerine bağlanmak için bir veri bağlantısı gerekiyor."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Geçersiz Hesap"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Belirtilen hesap bu cihazda mevcut değil. Lütfen farklı bir hesap seçin."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play hizmetleriyle ilgili bilinmeyen sorun."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play hizmetleri"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Cihazınız, uygulamalarınızdan bazıları için gerekli olan Google Play hizmetlerini desteklemiyor. Lütfen yardım için üreticiyle iletişim kurun."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Güncelle"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Oturum aç"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google\'da oturum aç"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Telefonda aç"</string>
-</resources>
diff --git a/play-services-base/res/values-uk/common_strings.xml b/play-services-base/res/values-uk/common_strings.xml
deleted file mode 100644
index 65b7611..0000000
--- a/play-services-base/res/values-uk/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Помилка сервісів Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Щоб додаток працював, потрібно встановити сервіси Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Щоб додаток працював, потрібно оновити сервіси Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Для роботи додатка потрібно оновити Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Щоб додаток працював, потрібно ввімкнути сервіси Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Запит від додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Установіть сервіси Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ця програма не запуститься без Google Play Послуг, яких немає у вашому телефоні."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ця програма не запуститься без Google Play Послуг, яких немає на вашому планшетному ПК."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Установити сервіси Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Увімкніть сервіси Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Цей додаток не працюватиме, доки ви не ввімкнете сервіси Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Увімкнути сервіси Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Оновіть сервіси Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Оновити Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Цей додаток не запуститься, доки ви не оновите сервіси Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Цей додаток запуститься, лише коли ви оновите Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Помилка мережі"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Для під’єднання до сервісів Google Play потрібне з’єднання з мережею."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Недійсний обліковий запис"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Указаний обліковий запис не існує на цьому пристрої. Виберіть інший обліковий запис."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Невідома проблема із сервісами Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Сервіси Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Ваш пристрій не підтримує Сервіси Google Play, від яких залежить робота деяких програм. Зверніться по допомогу до виробника."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Оновити"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Увійти"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Увійти в обл.запис Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Відкрити на телефоні"</string>
-</resources>
diff --git a/play-services-base/res/values-ur-rPK/common_strings.xml b/play-services-base/res/values-ur-rPK/common_strings.xml
deleted file mode 100644
index 3ae6c76..0000000
--- a/play-services-base/res/values-ur-rPK/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"‏Google Play سروسز کی خرابی"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"‏ایک ایپلیکیشن کیلئے Google Play سروسز کا انسٹال ہونا ضروری ہے۔"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"‏ایک ایپلیکیشن کیلئے Google Play سروسز کیلئے ایک اپ ڈیٹ ضروری ہے۔"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"‏ایک اپیلیکیشن کو Android Wear ایپ کیلئے ایک اپ ڈیٹ درکار ہے۔"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"‏ایک ایپلیکیشن کیلئے Google Play سروسز کا فعال ہونا ضروری ہے۔"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے ذریعے درخواست کی گئی"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"‏Google Play سروسز حاصل کریں"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"‏یہ ایپ Google Play سروسز کے بغیر نہیں چلے گی، جو آپ کے فون سے غائب ہے۔"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"‏یہ ایپ Google Play سروسز کے بغیر نہیں چلے گی، جو آپ کے ٹیبلیٹ سے غائب ہے۔"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"‏Google Play سروسز حاصل کریں"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"‏Google Play سروسز فعال کریں"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"‏یہ ایپ تب تک کام نہیں کرے گی جب تک کہ آپ Google Play سروسز فعال نہیں کر لیتے ہیں۔"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"‏Google Play سروسز فعال کریں"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"‏Google Play سروسز اپ ڈیٹ کریں"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"‏Android Wear کو اپ ڈیٹ کریں"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"‏یہ ایپ تب تک نہیں چلے گی جب تک کہ آپ Google Play سروسز اپ ڈیٹ نہیں کر لیتے ہیں۔"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"‏جب تک آپ Android Wear ایپ کو اپ ڈیٹ نہیں کر لیتے یہ ایپ نہیں چلے گی۔"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"نیٹ ورک میں خرابی"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"‏Google Play سروسز سے مربوط ہونے کیلئے ایک ڈیٹا کنکشن کی ضرورت ہے۔"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"غلط اکاؤنٹ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"متعین اکاؤنٹ اس آلہ پر موجود نہیں ہے۔ براہ کرم ایک مختلف اکاؤنٹ منتخب کریں۔"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"‏Google Play سروسز کے ساتھ نامعلوم مسئلہ۔"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"‏Google Play سروسز"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"‏Google Play سروسز، جن پر آپ کی کچھ ایپلیکیشنز انحصار کرتی ہیں، آپ کے آلہ کے ذریعے تعاون یافتہ نہیں ہے۔ براہ کرم مدد کیلئے مینوفیکچرر سے رابطہ کریں۔"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"اپ ڈیٹ کریں"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"سائن ان کریں"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"‏Google کے ساتھ سائن ان کریں"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"فون پر کھولیں"</string>
-</resources>
diff --git a/play-services-base/res/values-uz-rUZ/common_strings.xml b/play-services-base/res/values-uz-rUZ/common_strings.xml
deleted file mode 100644
index 22ca05a..0000000
--- a/play-services-base/res/values-uz-rUZ/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play xizmatlari xatosi"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Ilova Google Play xizmatlarining o‘rnatilishini talab qiladi."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Ilova Google Play xizmatlarining yangilanishini talab qiladi."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Ilovadan foydalanish uchun Android Wear ilovasini yangilash lozim."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Ilova Google Play xizmatlarining yoqilishini talab qiladi."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"So‘rov manbasi: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Google Play xizmatlarini yuklab oling"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ushbu ilova ishlashi uchun telefoningizga Google Play xizmatlarini o‘rnatish lozim."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ushbu ilova ishlashi uchun planshetingizga Google Play xizmatlarini o‘rnatish lozim."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Google Play xizmatlarini yuklab oling"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Google Play xizmatlarini yoqish"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ushbu ilova Google Play xizmatlari yoqilmaguncha ishlamaydi."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Google Play xizmatlarini yoqish"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Google Play xizmatlarini yangilash"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Android Wear ilovasini yangilash"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ushbu ilova Google Play xizmatlari yangilanmaguncha ishlamaydi."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ushbu ilova Android Wear ilovasi yangilanmaguncha ishlamaydi."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Tarmoq xatosi"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Google Play xizmatlariga ulanish uchun internet zarur."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Hisob haqiqiy emas"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Ushbu qurilmada ko‘rsatilgan hisob mavjud emas. Boshqa hisobni tanlang."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play xizmatlari bilan bog‘liq noma’lum muammo yuz berdi."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play xizmatlari"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Ba’zi ilovalarning ishlashi uchun zarur hisoblangan Google Play xizmatlari qurilmangizda qo‘llab-quvvatlanmaydi. Yordam olish uchun ishlab chiqaruvchiga murojaat qiling."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Yangilash"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Kirish"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Google orqali kirish"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Telefonda ochish"</string>
-</resources>
diff --git a/play-services-base/res/values-vi/common_strings.xml b/play-services-base/res/values-vi/common_strings.xml
deleted file mode 100644
index 24c9a82..0000000
--- a/play-services-base/res/values-vi/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Lỗi dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Một ứng dụng yêu cầu cài đặt các dịch vụ của Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Một ứng dụng yêu cầu cập nhật đối với các dịch vụ của Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Ứng dụng yêu cầu cập nhật lên ứng dụng Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Một ứng dụng yêu cầu bật các dịch vụ của Google Play."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Được yêu cầu bởi <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Cài đặt dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Điện thoại của bạn bị thiếu dịch vụ này."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Ứng dụng này sẽ không chạy nếu không có dịch vụ của Google Play. Máy tính bảng của bạn bị thiếu dịch vụ này."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Cài đặt dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Bật dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Ứng dụng này sẽ không hoạt động trừ khi bạn bật dịch vụ của Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Bật dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Cập nhật dịch vụ của Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Cập nhật Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Ứng dụng này sẽ không chạy trừ khi bạn cập nhật dịch vụ của Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Ứng dụng này chỉ chạy khi bạn cập nhật ứng dụng Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Lỗi mạng"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Cần có kết nối dữ liệu để kết nối với các dịch vụ của Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"Tài khoản không hợp lệ"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"Tài khoản đã chỉ định không tồn tại trên thiết bị này. Vui lòng chọn một tài khoản khác."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Sự cố không xác định với dịch vụ của Google Play."</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Dịch vụ của Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Các dịch vụ của Google Play mà một số ứng dụng của bạn dựa vào không được thiết bị của bạn hỗ trợ. Vui lòng liên hệ với nhà sản xuất để được hỗ trợ."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Cập nhật"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Đăng nhập"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Đăng nhập bằng Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Mở trên điện thoại"</string>
-</resources>
diff --git a/play-services-base/res/values-zh-rCN/common_strings.xml b/play-services-base/res/values-zh-rCN/common_strings.xml
deleted file mode 100644
index a886386..0000000
--- a/play-services-base/res/values-zh-rCN/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play服务出错"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"安装Google Play服务后才能运行应用。"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"更新Google Play服务后才能运行应用。"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"某个应用需要更新Android Wear应用才能正常运行。"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"启用Google Play服务后才能运行应用。"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"<xliff:g id="APP_NAME">%1$s</xliff:g>发出的请求"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"获取Google Play服务"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"您的手机中没有Google Play服务，您必须先安装该服务才能运行此应用。"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"您的平板电脑中没有Google Play服务，您必须先安装该服务才能运行此应用。"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"获取Google Play服务"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"启用Google Play服务"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"您必须先启用Google Play服务才能运行此应用。"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"启用Google Play服务"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"更新Google Play服务"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"更新Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"您必须先更新Google Play服务才能运行此应用。"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"只有更新Android Wear应用后，此应用才能正常运行。"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"网络错误"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"您必须有数据网络连接才能接入Google Play服务。"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"无效帐户"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"此设备上不存在指定的帐户，请选择其他帐户。"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play服务出现未知问题。"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play服务"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"您的设备不支持部分应用所依赖的Google Play服务。请与设备制造商联系，以寻求帮助。"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"更新"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"登录"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"使用Google帐户登录"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"在手机上打开"</string>
-</resources>
diff --git a/play-services-base/res/values-zh-rHK/common_strings.xml b/play-services-base/res/values-zh-rHK/common_strings.xml
deleted file mode 100644
index 3cf8121..0000000
--- a/play-services-base/res/values-zh-rHK/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play 服務錯誤"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"必須安裝「Google Play 服務」，才能使用應用程式。"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"必須更新「Google Play 服務」，才能使用應用程式。"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"有一個應用程式要求更新 Android Wear 應用程式。"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"必須啟用「Google Play 服務」，才能使用應用程式。"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」提出要求"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"取得 Google Play 服務"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"您的手機未安裝 Google Play 服務，安裝後才能執行這個應用程式。"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"您的平板電腦未安裝 Google Play 服務，安裝後才能執行這個應用程式。"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"取得 Google Play 服務"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"啟用 Google Play 服務"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"您必須啟用 Google Play 服務，才能執行這個應用程式。"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"啟用 Google Play 服務"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"更新 Google Play 服務"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"更新 Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"您必須更新 Google Play 服務，才能執行這個應用程式。"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"您必須更新 Android Wear 應用程式，這個應用程式才能運作。"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"網絡錯誤"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"要連接 Google Play 服務，必需數據連線。"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"無效的帳戶"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"這個裝置上沒有您指定的帳戶，請選擇其他帳戶。"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play 服務出現不明問題。"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play 服務"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"您的裝置不支援部分應用程式所需的 Google Play 服務。如需協助，請與您的裝置製造商聯絡。"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"更新"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"登入"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"登入 Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"在手機中開啟"</string>
-</resources>
diff --git a/play-services-base/res/values-zh-rTW/common_strings.xml b/play-services-base/res/values-zh-rTW/common_strings.xml
deleted file mode 100644
index c443f7c..0000000
--- a/play-services-base/res/values-zh-rTW/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Google Play 服務發生錯誤"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"應用程式要求安裝 Google Play 服務。"</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"應用程式要求更新 Google Play 服務。"</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"有一個應用程式要求更新 Android Wear 應用程式。"</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"應用程式要求啟用 Google Play 服務。"</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」提出要求"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"取得 Google Play 服務"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"您的手機並未安裝 Google Play 服務，所以無法執行這個應用程式。"</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"您的平板電腦並未安裝 Google Play 服務，所以無法執行這個應用程式。"</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"取得 Google Play 服務"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"啟用 Google Play 服務"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"您必須啟用 Google Play 服務，這個應用程式才能運作。"</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"啟用 Google Play 服務"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"更新 Google Play 服務"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"更新 Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"您必須更新 Google Play 服務，才能執行這個應用程式。"</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"您必須更新 Android Wear 應用程式，這個應用程式才能運作。"</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"網路錯誤"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"需要數據連線才能連上 Google Play 服務。"</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"無效的帳戶"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"這個裝置上沒有您所指定的帳戶，請選擇其他帳戶。"</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Google Play 服務發生不明問題。"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Google Play 服務"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"您的裝置不支援部分應用程式所需的 Google Play 服務。如需協助，請與您的裝置製造商聯絡。"</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"更新"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"登入"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"使用 Google 帳戶登入"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"在手機上開啟"</string>
-</resources>
diff --git a/play-services-base/res/values-zu/common_strings.xml b/play-services-base/res/values-zu/common_strings.xml
deleted file mode 100644
index 82fe012..0000000
--- a/play-services-base/res/values-zu/common_strings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="common_google_play_services_notification_ticker" msgid="1852570676146674985">"Iphutha lamasevisi we-Google Play"</string>
-    <string name="common_google_play_services_notification_needs_installation_title" msgid="8120534356798772974">"Uhlelo lokusebenza ludinga ukufakwa kwamasevisi we-Google Play."</string>
-    <string name="common_google_play_services_notification_needs_update_title" msgid="1388129345631079938">"Uhlelo lokusebenza ludinga isibuyekezo samasevisi we-Google Play."</string>
-    <string name="common_android_wear_notification_needs_update_text" msgid="473679118463211576">"Uhlelo lokusebenza ludinga ukubuyekezelwa kuhlelo lokusebenza le-Android Wear."</string>
-    <string name="common_google_play_services_needs_enabling_title" msgid="2583358409598976717">"Uhlelo lokusebenza ludinga amasevisi we-Google Play ukuze anikwe amandla."</string>
-    <string name="common_google_play_services_error_notification_requested_by_msg" msgid="2443362625939284971">"Icelwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="common_google_play_services_install_title" msgid="26645092511305524">"Thola amasevisi e-Google Play"</string>
-    <string name="common_google_play_services_install_text_phone" msgid="8685301130651051380">"Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho efonini yakho."</string>
-    <string name="common_google_play_services_install_text_tablet" msgid="1589957570365247855">"Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kwamasevisi e-Google Play, angekho kuthebulethi yakho."</string>
-    <string name="common_google_play_services_install_button" msgid="8515591849428043265">"Thola amasevisi e-Google Play"</string>
-    <string name="common_google_play_services_enable_title" msgid="529078775174559253">"Nika amandla amasevisi e-Google Play"</string>
-    <string name="common_google_play_services_enable_text" msgid="7627896071867667758">"Lolu hlelo lokusebenza ngeke lusebenze ngaphandle nje kokuthi unike amandla amasevisi e-Google Play."</string>
-    <string name="common_google_play_services_enable_button" msgid="4181637455539816337">"Nika amandla amasevisi e-Google Play"</string>
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">"Buyekeza amasevisi e-Google Play"</string>
-    <string name="common_android_wear_update_title" msgid="1366439133145190222">"Buyekeza i-Android Wear"</string>
-    <string name="common_google_play_services_update_text" msgid="448354684997260580">"Lolu hlelo lokusebenza ngeke lusebenze ngaphandle nje kokuthi ubuyekeze amasevisi e-Google Play."</string>
-    <string name="common_android_wear_update_text" msgid="3046420540094071256">"Lolu hlelo lokusebenza ngeke lusebenze ngaphandle kokuthi ubuyekeze uhlelo lokusebenza le-Android Wear."</string>
-    <string name="common_google_play_services_network_error_title" msgid="3827284619958211114">"Iphutha lenethiwekhi"</string>
-    <string name="common_google_play_services_network_error_text" msgid="9038847255613537209">"Kudingeka ukuxhumeka kwedatha ukuze kuxhunyekwe kumasevisi we-Google Play."</string>
-    <string name="common_google_play_services_invalid_account_title" msgid="1066672360770936753">"I-Akhawunti engavumelekile"</string>
-    <string name="common_google_play_services_invalid_account_text" msgid="4983316348021735578">"I-Akhawunti ecacisiwe ayikho kule divayisi. Sicela ukhethe i-akhawunti ehlukile."</string>
-    <string name="common_google_play_services_unknown_issue" msgid="4762332809710093730">"Indaba engaziwa yamasevisi we-Google Play"</string>
-    <string name="common_google_play_services_unsupported_title" msgid="6334768798839376943">"Amasevisi we-Google Play"</string>
-    <string name="common_google_play_services_unsupported_text" msgid="3542578567569488671">"Amasevisi we-Google Play, okungukuthi ezinye izinhlelo zakho zithembele kuwo, awasekelwe yidivayisi yakho. Sicela uxhumane nomkhiqizi ukuze uthole usizo."</string>
-    <string name="common_google_play_services_update_button" msgid="8932944190611227642">"Isibuyekezo"</string>
-    <string name="common_signin_button_text" msgid="9071884888741449141">"Ngena ngemvume"</string>
-    <string name="common_signin_button_text_long" msgid="2429381841831957106">"Ngena ngemvume nge-Google"</string>
-    <string name="common_open_on_phone" msgid="411506735369601515">"Vula kufoni"</string>
-</resources>
diff --git a/play-services-base/res/values/common_attrs.xml b/play-services-base/res/values/common_attrs.xml
deleted file mode 100644
index 8740250..0000000
--- a/play-services-base/res/values/common_attrs.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright 2014 Google Inc. All Rights Reserved. -->
-<resources>
-
-    <!-- Attributes for LoadingImageView -->
-    <declare-styleable name="LoadingImageView">
-
-        <!--
-        What kind of aspect ratio adjustment to do.  It must be one of "none", "adjust_width",
-        or "adjust_height".
-        -->
-        <attr name="imageAspectRatioAdjust" format="enum">
-            <enum name="none" value="0" />
-            <enum name="adjust_width" value="1" />
-            <enum name="adjust_height" value="2" />
-        </attr>
-
-        <!--
-        The fixed aspect ratio to use in aspect ratio adjustments.
-        -->
-        <attr name="imageAspectRatio" format="float" />
-
-        <!--
-        Whether or not this view should have a circular clip applied
-        -->
-        <attr name="circleCrop" format="boolean" />
-
-    </declare-styleable>
-
-</resources>
diff --git a/play-services-base/res/values/common_colors.xml b/play-services-base/res/values/common_colors.xml
deleted file mode 100644
index 6b2740a..0000000
--- a/play-services-base/res/values/common_colors.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <!-- Sign-in Button Colors -->
-    <color name="common_signin_btn_dark_text_default">@android:color/white</color>
-    <color name="common_signin_btn_dark_text_pressed">@android:color/white</color>
-    <color name="common_signin_btn_dark_text_disabled">#FFAAAAAA</color>
-    <color name="common_signin_btn_dark_text_focused">@android:color/white</color>
-    <color name="common_signin_btn_light_text_default">#FF737373</color>
-    <color name="common_signin_btn_light_text_pressed">@android:color/white</color>
-    <color name="common_signin_btn_light_text_disabled">#FFAAAAAA</color>
-    <color name="common_signin_btn_light_text_focused">#FF737373</color>
-    <color name="common_signin_btn_default_background">#FFDD4B39</color>
-    <color name="common_action_bar_splitter">#d2d2d2</color>
-</resources>
\ No newline at end of file
diff --git a/play-services-base/res/values/common_strings.xml b/play-services-base/res/values/common_strings.xml
deleted file mode 100644
index 24558ac..0000000
--- a/play-services-base/res/values/common_strings.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!--  Title for notification shown when GooglePlayServices is unavailable [CHAR LIMIT=42] -->
-    <string name="common_google_play_services_notification_ticker">Google Play services error</string>
-    <!--  Title for notification shown when GooglePlayServices needs to be installed
-        for an application to work. [CHAR LIMIT=70] -->
-    <string name="common_google_play_services_notification_needs_installation_title">An application requires installation of Google Play services.</string>
-    <!--  Title for notification shown when GooglePlayServices needs to be updated for an
-        application to work. [CHAR LIMIT=70] -->
-    <string name="common_google_play_services_notification_needs_update_title">An application requires an update for Google Play services.</string>
-    <!--  Text for notification shown when the Android Wear apps needs to be updated. Only shown on the wearable. [CHAR LIMIT=NONE] -->
-    <string name="common_android_wear_notification_needs_update_text">An application requires an update to the Android Wear app.</string>
-    <!--  Title for notification shown when GooglePlayServices needs to be enabled for an
-        application to work. [CHAR LIMIT=70] -->
-    <string name="common_google_play_services_needs_enabling_title">An application requires Google Play services to be enabled.</string>
-
-    <!--  Requested by string saying which app requested the notification. [CHAR LIMIT=42] -->
-    <string name="common_google_play_services_error_notification_requested_by_msg">Requested by <xliff:g id="app_name">%1$s</xliff:g></string>
-
-    <!-- Title of confirmation dialog informing user that they need to install
-        Google Play services (from Play Store) [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_install_title" msgid="7215213145546190223">Get Google Play services</string>
-
-    <!-- (For phones) Message in confirmation dialog informing user that
-        they need to install Google Play services (from Play Store) [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_install_text_phone" msgid="2122112764540849864">This app won\'t run without Google Play services, which are missing from your phone.</string>
-
-    <!-- (For tablets) Message in confirmation dialog informing user that
-        they need to install Google Play services (from Play Store) [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_install_text_tablet" msgid="7351599665250191022">This app won\'t run without Google Play services, which are missing from your tablet.</string>
-
-    <!-- Button in confirmation dialog for installing Google Play services [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_install_button" msgid="7153882981874058840">Get Google Play services</string>
-
-    <!-- Title of confirmation dialog informing user they need to enable
-        Google Play services in application settings [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_enable_title" msgid="5122002158466380389">Enable Google Play services</string>
-
-    <!-- Message in confirmation dialog informing user they need to enable
-        Google Play services in application settings [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_enable_text" msgid="227660514972886228">This app won\'t work unless you enable Google Play services.</string>
-
-    <!-- Button in confirmation dialog to enable Google Play services.  Clicking it
-        will direct user to application settings of Google Play services where they
-        can enable it [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_enable_button" msgid="2523291102206661146">Enable Google Play services</string>
-
-    <!-- Title of confirmation dialog informing user that they need to update
-        Google Play services (from Play Store) [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_update_title" msgid="6006316683626838685">Update Google Play services</string>
-    
-    <!-- Title of confirmation dialog informing user that they need to update
-        the Android Wear app (from Play Store) [CHAR LIMIT=40] -->
-    <string name="common_android_wear_update_title" msgid="6006316683626838685">Update Android Wear</string>
-
-    <!-- Message in confirmation dialog informing user that they need to update
-        Google Play services (from Play Store) [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_update_text" msgid="9053896323427875356">This app won\'t run unless you update Google Play services.</string>
-
-    <!-- Message in confirmation dialog informing user that they need to update
-        the Android Wear app [CHAR LIMIT=NONE] -->
-    <string name="common_android_wear_update_text">This app won\'t run unless you update the Android Wear app.</string>
-
-    <!-- Title of confirmation dialog informing the user that a network error occurred. [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_network_error_title">Network Error</string>
-
-    <!-- Message in confirmation dialog informing the user that a network error occurred. [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_network_error_text">A data connection is required to connect to Google Play services.</string>
-
-    <!-- Title of confirmation dialog informing the user that they provided an invalid account. [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_invalid_account_title">Invalid Account</string>
-
-    <!-- Message in confirmation dialog informing the user that they provided an invalid account. [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_invalid_account_text">The specified account does not exist on this device. Please choose a different account.</string>
-
-    <!-- Message in confirmation dialog informing user there is an unknown issue in Google Play
-        services [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_unknown_issue">Unknown issue with Google Play services.</string>
-
-    <!-- Title of confirmation dialog informing user that Google Play services is not supported on their device [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_unsupported_title">Google Play services</string>
-
-    <!-- Message in confirmation dialog informing user that Google Play services is not supported on their device [CHAR LIMIT=NONE] -->
-    <string name="common_google_play_services_unsupported_text">Google Play services, which some of your applications rely on, is not supported by your device. Please contact the manufacturer for assistance.</string>
-
-    <!-- Button in confirmation dialog for updating Google Play services [CHAR LIMIT=40] -->
-    <string name="common_google_play_services_update_button" msgid="6556509956452265614">Update</string>
-
-    <!-- Sign-in button text [CHAR LIMIT=15] -->
-    <string name="common_signin_button_text">Sign in</string>
-
-    <!-- Long form sign-in button text [CHAR LIMIT=30] -->
-    <string name="common_signin_button_text_long">Sign in with Google</string>
-
-    <!-- Label for an action to open a notifications content on the phone [CHAR LIMIT=25] -->
-    <string name="common_open_on_phone">Open on phone</string>
-
-</resources>
diff --git a/play-services-base/res/values/version.xml b/play-services-base/res/values/version.xml
deleted file mode 100644
index d9cb5ea..0000000
--- a/play-services-base/res/values/version.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="google_play_services_version">6587000</integer>
-</resources>
\ No newline at end of file
diff --git a/play-services-base/src/.gitkeep b/play-services-base/src/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/play-services-base/src/.gitkeep
+++ /dev/null
diff --git a/play-services-location/.classpath b/play-services-location/.classpath
deleted file mode 100644
index f8b9238..0000000
--- a/play-services-location/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="gen">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/play-services-location/.project b/play-services-location/.project
deleted file mode 100644
index 14e2859..0000000
--- a/play-services-location/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>play-services-location</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/play-services-location/.settings/org.eclipse.jdt.core.prefs b/play-services-location/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b080d2d..0000000
--- a/play-services-location/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/play-services-location/AndroidManifest.xml b/play-services-location/AndroidManifest.xml
deleted file mode 100644
index c3729c9..0000000
--- a/play-services-location/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.android.gms.location">
-    <uses-sdk android:minSdkVersion="9"/>
-    <application />
-</manifest>
diff --git a/play-services-location/build.xml b/play-services-location/build.xml
deleted file mode 100644
index 157ab53..0000000
--- a/play-services-location/build.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="play_services_location" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-        message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-        unless="sdk.dir" />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/play-services-location/libs/play-services-location.jar b/play-services-location/libs/play-services-location.jar
deleted file mode 100644
index b440785..0000000
--- a/play-services-location/libs/play-services-location.jar
+++ /dev/null
diff --git a/play-services-location/lint.xml b/play-services-location/lint.xml
deleted file mode 100644
index 715caf3..0000000
--- a/play-services-location/lint.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <issue id="AaptCrash" severity="ignore" />
-    <issue id="AccidentalOctal" severity="ignore" />
-    <issue id="AdapterViewChildren" severity="ignore" />
-    <issue id="AddJavascriptInterface" severity="ignore" />
-    <issue id="AllowBackup" severity="ignore" />
-    <issue id="AlwaysShowAction" severity="ignore" />
-    <issue id="AndroidGradlePluginVersion" severity="ignore" />
-    <issue id="AppCompatMethod" severity="ignore" />
-    <issue id="AppCompatResource" severity="ignore" />
-    <issue id="Assert" severity="ignore" />
-    <issue id="ButtonCase" severity="ignore" />
-    <issue id="ButtonOrder" severity="ignore" />
-    <issue id="ButtonStyle" severity="ignore" />
-    <issue id="ByteOrderMark" severity="ignore" />
-    <issue id="ClickableViewAccessibility" severity="ignore" />
-    <issue id="CommitPrefEdits" severity="ignore" />
-    <issue id="CommitTransaction" severity="ignore" />
-    <issue id="ContentDescription" severity="ignore" />
-    <issue id="CustomViewStyleable" severity="ignore" />
-    <issue id="CutPasteId" severity="ignore" />
-    <issue id="DalvikOverride" severity="ignore" />
-    <issue id="DefaultLocale" severity="ignore" />
-    <issue id="Deprecated" severity="ignore" />
-    <issue id="DeviceAdmin" severity="ignore" />
-    <issue id="DisableBaselineAlignment" severity="ignore" />
-    <issue id="DrawAllocation" severity="ignore" />
-    <issue id="DuplicateActivity" severity="ignore" />
-    <issue id="DuplicateDefinition" severity="ignore" />
-    <issue id="DuplicateIds" severity="ignore" />
-    <issue id="DuplicateIncludedIds" severity="ignore" />
-    <issue id="DuplicateUsesFeature" severity="ignore" />
-    <issue id="EnforceUTF8" severity="ignore" />
-    <issue id="ExportedContentProvider" severity="ignore" />
-    <issue id="ExportedPreferenceActivity" severity="ignore" />
-    <issue id="ExportedReceiver" severity="ignore" />
-    <issue id="ExportedService" severity="ignore" />
-    <issue id="ExtraText" severity="ignore" />
-    <issue id="ExtraTranslation" severity="ignore" />
-    <issue id="FloatMath" severity="ignore" />
-    <issue id="GetInstance" severity="ignore" />
-    <issue id="GifUsage" severity="ignore" />
-    <issue id="GradleCompatible" severity="ignore" />
-    <issue id="GradleDependency" severity="ignore" />
-    <issue id="GradleDeprecated" severity="ignore" />
-    <issue id="GradleDynamicVersion" severity="ignore" />
-    <issue id="GradleGetter" severity="ignore" />
-    <issue id="GradleIdeError" severity="ignore" />
-    <issue id="GradleOverrides" severity="ignore" />
-    <issue id="GradlePath" severity="ignore" />
-    <issue id="GrantAllUris" severity="ignore" />
-    <issue id="GridLayout" severity="ignore" />
-    <issue id="HandlerLeak" severity="ignore" />
-    <issue id="HardcodedDebugMode" severity="ignore" />
-    <issue id="HardcodedText" severity="ignore" />
-    <issue id="IconColors" severity="ignore" />
-    <issue id="IconDensities" severity="ignore" />
-    <issue id="IconDipSize" severity="ignore" />
-    <issue id="IconDuplicates" severity="ignore" />
-    <issue id="IconDuplicatesConfig" severity="ignore" />
-    <issue id="IconExtension" severity="ignore" />
-    <issue id="IconLauncherShape" severity="ignore" />
-    <issue id="IconLocation" severity="ignore" />
-    <issue id="IconMissingDensityFolder" severity="ignore" />
-    <issue id="IconMixedNinePatch" severity="ignore" />
-    <issue id="IconNoDpi" severity="ignore" />
-    <issue id="IconXmlAndPng" severity="ignore" />
-    <issue id="IllegalResourceRef" severity="ignore" />
-    <issue id="ImpliedQuantity" severity="ignore" />
-    <issue id="InOrMmUsage" severity="ignore" />
-    <issue id="IncludeLayoutParam" severity="ignore" />
-    <issue id="InconsistentArrays" severity="ignore" />
-    <issue id="InconsistentLayout" severity="ignore" />
-    <issue id="InefficientWeight" severity="ignore" />
-    <issue id="InflateParams" severity="ignore" />
-    <issue id="InlinedApi" severity="ignore" />
-    <issue id="InnerclassSeparator" severity="ignore" />
-    <issue id="Instantiatable" severity="ignore" />
-    <issue id="InvalidId" severity="ignore" />
-    <issue id="InvalidPackage" severity="ignore" />
-    <issue id="JavascriptInterface" severity="ignore" />
-    <issue id="LabelFor" severity="ignore" />
-    <issue id="LibraryCustomView" severity="ignore" />
-    <issue id="LocalSuppress" severity="ignore" />
-    <issue id="LocaleFolder" severity="ignore" />
-    <issue id="MangledCRLF" severity="ignore" />
-    <issue id="ManifestOrder" severity="ignore" />
-    <issue id="ManifestTypo" severity="ignore" />
-    <issue id="MenuTitle" severity="ignore" />
-    <issue id="MergeRootFrame" severity="ignore" />
-    <issue id="MissingApplicationIcon" severity="ignore" />
-    <issue id="MissingId" severity="ignore" />
-    <issue id="MissingPrefix" severity="ignore" />
-    <issue id="MissingQuantity" severity="ignore" />
-    <issue id="MissingRegistered" severity="ignore" />
-    <issue id="MissingSuperCall" severity="ignore" />
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingVersion" severity="ignore" />
-    <issue id="MockLocation" severity="ignore" />
-    <issue id="MultipleUsesSdk" severity="ignore" />
-    <issue id="NamespaceTypo" severity="ignore" />
-    <issue id="NestedScrolling" severity="ignore" />
-    <issue id="NestedWeights" severity="ignore" />
-    <issue id="NewApi" severity="ignore" />
-    <issue id="NfcTechWhitespace" severity="ignore" />
-    <issue id="NotSibling" severity="ignore" />
-    <issue id="ObsoleteLayoutParam" severity="ignore" />
-    <issue id="OldTargetApi" severity="ignore" />
-    <issue id="OnClick" severity="ignore" />
-    <issue id="Orientation" severity="ignore" />
-    <issue id="Overdraw" severity="ignore" />
-    <issue id="Override" severity="ignore" />
-    <issue id="PackagedPrivateKey" severity="ignore" />
-    <issue id="ParcelCreator" severity="ignore" />
-    <issue id="PrivateResource" severity="ignore" />
-    <issue id="Proguard" severity="ignore" />
-    <issue id="ProguardSplit" severity="ignore" />
-    <issue id="PropertyEscape" severity="ignore" />
-    <issue id="ProtectedPermissions" severity="ignore" />
-    <issue id="PxUsage" severity="ignore" />
-    <issue id="Recycle" severity="ignore" />
-    <issue id="ReferenceType" severity="ignore" />
-    <issue id="Registered" severity="ignore" />
-    <issue id="RequiredSize" severity="ignore" />
-    <issue id="ResAuto" severity="ignore" />
-    <issue id="ResourceAsColor" severity="ignore" />
-    <issue id="ResourceCycle" severity="ignore" />
-    <issue id="ResourceName" severity="ignore" />
-    <issue id="RtlCompat" severity="ignore" />
-    <issue id="RtlEnabled" severity="ignore" />
-    <issue id="RtlHardcoded" severity="ignore" />
-    <issue id="RtlSymmetry" severity="ignore" />
-    <issue id="ScrollViewCount" severity="ignore" />
-    <issue id="ScrollViewSize" severity="ignore" />
-    <issue id="SdCardPath" severity="ignore" />
-    <issue id="SecureRandom" severity="ignore" />
-    <issue id="ServiceCast" severity="ignore" />
-    <issue id="SetJavaScriptEnabled" severity="ignore" />
-    <issue id="ShowToast" severity="ignore" />
-    <issue id="SignatureOrSystemPermissions" severity="ignore" />
-    <issue id="SimpleDateFormat" severity="ignore" />
-    <issue id="SmallSp" severity="ignore" />
-    <issue id="SpUsage" severity="ignore" />
-    <issue id="StateListReachable" severity="ignore" />
-    <issue id="StringFormatCount" severity="ignore" />
-    <issue id="StringFormatInvalid" severity="ignore" />
-    <issue id="StringFormatMatches" severity="ignore" />
-    <issue id="StringShouldBeInt" severity="ignore" />
-    <issue id="Suspicious0dp" severity="ignore" />
-    <issue id="SuspiciousImport" severity="ignore" />
-    <issue id="TextFields" severity="ignore" />
-    <issue id="TextViewEdits" severity="ignore" />
-    <issue id="TooDeepLayout" severity="ignore" />
-    <issue id="TooManyViews" severity="ignore" />
-    <issue id="TrulyRandom" severity="ignore" />
-    <issue id="TypographyDashes" severity="ignore" />
-    <issue id="TypographyEllipsis" severity="ignore" />
-    <issue id="TypographyFractions" severity="ignore" />
-    <issue id="TypographyOther" severity="ignore" />
-    <issue id="Typos" severity="ignore" />
-    <issue id="UniquePermission" severity="ignore" />
-    <issue id="UnknownId" severity="ignore" />
-    <issue id="UnknownIdInLayout" severity="ignore" />
-    <issue id="UnlocalizedSms" severity="ignore" />
-    <issue id="UnusedAttribute" severity="ignore" />
-    <issue id="UnusedNamespace" severity="ignore" />
-    <issue id="UnusedQuantity" severity="ignore" />
-    <issue id="UnusedResources" severity="ignore" />
-    <issue id="UseCheckPermission" severity="ignore" />
-    <issue id="UseCompoundDrawables" severity="ignore" />
-    <issue id="UseSparseArrays" severity="ignore" />
-    <issue id="UseValueOf" severity="ignore" />
-    <issue id="UselessLeaf" severity="ignore" />
-    <issue id="UselessParent" severity="ignore" />
-    <issue id="UsesMinSdkAttributes" severity="ignore" />
-    <issue id="ValidFragment" severity="ignore" />
-    <issue id="ViewConstructor" severity="ignore" />
-    <issue id="ViewHolder" severity="ignore" />
-    <issue id="ViewTag" severity="ignore" />
-    <issue id="Wakelock" severity="ignore" />
-    <issue id="WebViewLayout" severity="ignore" />
-    <issue id="WorldReadableFiles" severity="ignore" />
-    <issue id="WorldWriteableFiles" severity="ignore" />
-    <issue id="WrongCall" severity="ignore" />
-    <issue id="WrongCase" severity="ignore" />
-    <issue id="WrongFolder" severity="ignore" />
-    <issue id="WrongManifestParent" severity="ignore" />
-    <issue id="WrongViewCast" severity="ignore" />
-</lint>
\ No newline at end of file
diff --git a/play-services-location/play-services-location.iml b/play-services-location/play-services-location.iml
deleted file mode 100644
index 3525dde..0000000
--- a/play-services-location/play-services-location.iml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="LIBRARY_PROJECT" value="true" />
-        <option name="UPDATE_PROPERTY_FILES" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/libs" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" />
-      </library>
-    </orderEntry>
-  </component>
-  <component name="org.twodividedbyzero.idea.findbugs">
-    <option name="_basePreferences">
-      <map>
-        <entry key="property.analysisEffortLevel" value="default" />
-        <entry key="property.analyzeAfterCompile" value="false" />
-        <entry key="property.annotationGutterIconEnabled" value="true" />
-        <entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressFBWarnings" />
-        <entry key="property.annotationTextRangeMarkupEnabled" value="true" />
-        <entry key="property.exportAsHtml" value="true" />
-        <entry key="property.exportAsXml" value="true" />
-        <entry key="property.exportBaseDir" value="" />
-        <entry key="property.exportCreateArchiveDir" value="false" />
-        <entry key="property.exportOpenBrowser" value="true" />
-        <entry key="property.minPriorityToReport" value="Medium" />
-        <entry key="property.runAnalysisInBackground" value="false" />
-        <entry key="property.showHiddenDetectors" value="false" />
-        <entry key="property.toolWindowToFront" value="true" />
-      </map>
-    </option>
-    <option name="_detectors">
-      <map>
-        <entry key="AppendingToAnObjectOutputStream" value="true" />
-        <entry key="AtomicityProblem" value="true" />
-        <entry key="BadAppletConstructor" value="false" />
-        <entry key="BadResultSetAccess" value="true" />
-        <entry key="BadSyntaxForRegularExpression" value="true" />
-        <entry key="BadUseOfReturnValue" value="true" />
-        <entry key="BadlyOverriddenAdapter" value="true" />
-        <entry key="BooleanReturnNull" value="true" />
-        <entry key="BuildInterproceduralCallGraph" value="false" />
-        <entry key="BuildObligationPolicyDatabase" value="true" />
-        <entry key="BuildStringPassthruGraph" value="true" />
-        <entry key="CallToUnsupportedMethod" value="false" />
-        <entry key="CalledMethods" value="true" />
-        <entry key="CheckCalls" value="false" />
-        <entry key="CheckExpectedWarnings" value="false" />
-        <entry key="CheckImmutableAnnotation" value="true" />
-        <entry key="CheckRelaxingNullnessAnnotation" value="true" />
-        <entry key="CheckTypeQualifiers" value="true" />
-        <entry key="CloneIdiom" value="true" />
-        <entry key="ComparatorIdiom" value="true" />
-        <entry key="ConfusedInheritance" value="true" />
-        <entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
-        <entry key="CrossSiteScripting" value="true" />
-        <entry key="DefaultEncodingDetector" value="true" />
-        <entry key="DoInsideDoPrivileged" value="true" />
-        <entry key="DontCatchIllegalMonitorStateException" value="true" />
-        <entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
-        <entry key="DontUseEnum" value="true" />
-        <entry key="DroppedException" value="true" />
-        <entry key="DumbMethodInvocations" value="true" />
-        <entry key="DumbMethods" value="true" />
-        <entry key="DuplicateBranches" value="true" />
-        <entry key="EmptyZipFileEntry" value="false" />
-        <entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
-        <entry key="ExplicitSerialization" value="true" />
-        <entry key="FieldItemSummary" value="true" />
-        <entry key="FinalizerNullsFields" value="true" />
-        <entry key="FindBadCast2" value="true" />
-        <entry key="FindBadForLoop" value="true" />
-        <entry key="FindBugsSummaryStats" value="true" />
-        <entry key="FindCircularDependencies" value="false" />
-        <entry key="FindDeadLocalStores" value="true" />
-        <entry key="FindDoubleCheck" value="true" />
-        <entry key="FindEmptySynchronizedBlock" value="true" />
-        <entry key="FindFieldSelfAssignment" value="true" />
-        <entry key="FindFinalizeInvocations" value="true" />
-        <entry key="FindFloatEquality" value="true" />
-        <entry key="FindFloatMath" value="false" />
-        <entry key="FindHEmismatch" value="true" />
-        <entry key="FindInconsistentSync2" value="true" />
-        <entry key="FindJSR166LockMonitorenter" value="true" />
-        <entry key="FindLocalSelfAssignment2" value="true" />
-        <entry key="FindMaskedFields" value="true" />
-        <entry key="FindMismatchedWaitOrNotify" value="true" />
-        <entry key="FindNakedNotify" value="true" />
-        <entry key="FindNoSideEffectMethods" value="true" />
-        <entry key="FindNonSerializableStoreIntoSession" value="false" />
-        <entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
-        <entry key="FindNonShortCircuit" value="true" />
-        <entry key="FindNullDeref" value="true" />
-        <entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
-        <entry key="FindOpenStream" value="true" />
-        <entry key="FindPuzzlers" value="true" />
-        <entry key="FindRefComparison" value="true" />
-        <entry key="FindReturnRef" value="true" />
-        <entry key="FindRoughConstants" value="true" />
-        <entry key="FindRunInvocations" value="true" />
-        <entry key="FindSelfComparison" value="true" />
-        <entry key="FindSelfComparison2" value="true" />
-        <entry key="FindSleepWithLockHeld" value="true" />
-        <entry key="FindSpinLoop" value="true" />
-        <entry key="FindSqlInjection" value="true" />
-        <entry key="FindTwoLockWait" value="true" />
-        <entry key="FindUncalledPrivateMethods" value="true" />
-        <entry key="FindUnconditionalWait" value="true" />
-        <entry key="FindUninitializedGet" value="true" />
-        <entry key="FindUnrelatedTypesInGenericContainer" value="true" />
-        <entry key="FindUnreleasedLock" value="true" />
-        <entry key="FindUnsatisfiedObligation" value="true" />
-        <entry key="FindUnsyncGet" value="true" />
-        <entry key="FindUseOfNonSerializableValue" value="true" />
-        <entry key="FindUselessControlFlow" value="true" />
-        <entry key="FormatStringChecker" value="true" />
-        <entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
-        <entry key="HugeSharedStringConstants" value="true" />
-        <entry key="IDivResultCastToDouble" value="true" />
-        <entry key="IncompatMask" value="true" />
-        <entry key="InconsistentAnnotations" value="true" />
-        <entry key="InefficientIndexOf" value="true" />
-        <entry key="InefficientInitializationInsideLoop" value="true" />
-        <entry key="InefficientMemberAccess" value="false" />
-        <entry key="InefficientToArray" value="true" />
-        <entry key="InfiniteLoop" value="true" />
-        <entry key="InfiniteRecursiveLoop" value="true" />
-        <entry key="InheritanceUnsafeGetResource" value="true" />
-        <entry key="InitializationChain" value="true" />
-        <entry key="InitializeNonnullFieldsInConstructor" value="true" />
-        <entry key="InstantiateStaticClass" value="true" />
-        <entry key="IntCast2LongAsInstant" value="true" />
-        <entry key="InvalidJUnitTest" value="true" />
-        <entry key="IteratorIdioms" value="true" />
-        <entry key="LazyInit" value="true" />
-        <entry key="LoadOfKnownNullValue" value="true" />
-        <entry key="LostLoggerDueToWeakReference" value="true" />
-        <entry key="MethodReturnCheck" value="true" />
-        <entry key="Methods" value="true" />
-        <entry key="MultithreadedInstanceAccess" value="true" />
-        <entry key="MutableLock" value="true" />
-        <entry key="MutableStaticFields" value="true" />
-        <entry key="Naming" value="true" />
-        <entry key="Noise" value="false" />
-        <entry key="NoiseNullDeref" value="false" />
-        <entry key="NoteAnnotationRetention" value="true" />
-        <entry key="NoteCheckReturnValueAnnotations" value="true" />
-        <entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
-        <entry key="NoteJCIPAnnotation" value="true" />
-        <entry key="NoteNonNullAnnotations" value="false" />
-        <entry key="NoteNonnullReturnValues" value="false" />
-        <entry key="NoteSuppressedWarnings" value="true" />
-        <entry key="NoteUnconditionalParamDerefs" value="true" />
-        <entry key="NumberConstructor" value="true" />
-        <entry key="OptionalReturnNull" value="true" />
-        <entry key="OverridingEqualsNotSymmetrical" value="true" />
-        <entry key="PreferZeroLengthArrays" value="true" />
-        <entry key="PublicSemaphores" value="false" />
-        <entry key="QuestionableBooleanAssignment" value="true" />
-        <entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
-        <entry key="ReadReturnShouldBeChecked" value="true" />
-        <entry key="RedundantInterfaces" value="true" />
-        <entry key="ReflectiveClasses" value="true" />
-        <entry key="RepeatedConditionals" value="true" />
-        <entry key="ResolveAllReferences" value="false" />
-        <entry key="RuntimeExceptionCapture" value="true" />
-        <entry key="SerializableIdiom" value="true" />
-        <entry key="StartInConstructor" value="true" />
-        <entry key="StaticCalendarDetector" value="true" />
-        <entry key="StringConcatenation" value="true" />
-        <entry key="SuperfluousInstanceOf" value="true" />
-        <entry key="SuspiciousThreadInterrupted" value="true" />
-        <entry key="SwitchFallthrough" value="true" />
-        <entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
-        <entry key="SynchronizeAndNullCheckField" value="true" />
-        <entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
-        <entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
-        <entry key="TestASM" value="false" />
-        <entry key="TestDataflowAnalysis" value="false" />
-        <entry key="TestingGround" value="false" />
-        <entry key="TestingGround2" value="false" />
-        <entry key="TrainFieldStoreTypes" value="true" />
-        <entry key="TrainLongInstantfParams" value="true" />
-        <entry key="TrainNonNullAnnotations" value="true" />
-        <entry key="TrainUnconditionalDerefParams" value="true" />
-        <entry key="URLProblems" value="true" />
-        <entry key="UncallableMethodOfAnonymousClass" value="true" />
-        <entry key="UnnecessaryMath" value="true" />
-        <entry key="UnreadFields" value="true" />
-        <entry key="UselessSubclassMethod" value="false" />
-        <entry key="VarArgsProblems" value="true" />
-        <entry key="VolatileUsage" value="true" />
-        <entry key="WaitInLoop" value="true" />
-        <entry key="WrongMapIterator" value="true" />
-        <entry key="XMLFactoryBypass" value="true" />
-      </map>
-    </option>
-    <option name="_reportCategories">
-      <map>
-        <entry key="BAD_PRACTICE" value="true" />
-        <entry key="CORRECTNESS" value="true" />
-        <entry key="EXPERIMENTAL" value="true" />
-        <entry key="I18N" value="true" />
-        <entry key="MALICIOUS_CODE" value="true" />
-        <entry key="MT_CORRECTNESS" value="true" />
-        <entry key="PERFORMANCE" value="true" />
-        <entry key="SECURITY" value="true" />
-        <entry key="STYLE" value="true" />
-      </map>
-    </option>
-  </component>
-</module>
\ No newline at end of file
diff --git a/play-services-location/proguard.txt b/play-services-location/proguard.txt
deleted file mode 100644
index 199d972..0000000
--- a/play-services-location/proguard.txt
+++ /dev/null
@@ -1,23 +0,0 @@
--keep class * extends java.util.ListResourceBundle {
-    protected Object[][] getContents();
-}
-
-# Keep SafeParcelable value, needed for reflection. This is required to support backwards
-# compatibility of some classes.
--keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
-    public static final *** NULL;
-}
-
-# Keep the names of classes/members we need for client functionality.
--keepnames @com.google.android.gms.common.annotation.KeepName class *
--keepclassmembernames class * {
-    @com.google.android.gms.common.annotation.KeepName *;
-}
-
-# Needed for Parcelable/SafeParcelable Creators to not get stripped
--keepnames class * implements android.os.Parcelable {
-    public static final ** CREATOR;
-}
-
--dontwarn com.google.android.gms.common.**
--dontwarn com.google.android.gms.internal.**
\ No newline at end of file
diff --git a/play-services-location/project.properties b/play-services-location/project.properties
deleted file mode 100644
index 51a7632..0000000
--- a/play-services-location/project.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.txt
-
-# Project target.
-target=Google Inc.:Google APIs:21
-android.library=true
-android.library.reference.1=../play-services-base
diff --git a/play-services-location/res/drawable-hdpi/powered_by_google_dark.png b/play-services-location/res/drawable-hdpi/powered_by_google_dark.png
deleted file mode 100644
index 721905c..0000000
--- a/play-services-location/res/drawable-hdpi/powered_by_google_dark.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-hdpi/powered_by_google_light.png b/play-services-location/res/drawable-hdpi/powered_by_google_light.png
deleted file mode 100644
index 53328af..0000000
--- a/play-services-location/res/drawable-hdpi/powered_by_google_light.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-mdpi/powered_by_google_dark.png b/play-services-location/res/drawable-mdpi/powered_by_google_dark.png
deleted file mode 100644
index a152807..0000000
--- a/play-services-location/res/drawable-mdpi/powered_by_google_dark.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-mdpi/powered_by_google_light.png b/play-services-location/res/drawable-mdpi/powered_by_google_light.png
deleted file mode 100644
index 015a0ad..0000000
--- a/play-services-location/res/drawable-mdpi/powered_by_google_light.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-xhdpi/powered_by_google_dark.png b/play-services-location/res/drawable-xhdpi/powered_by_google_dark.png
deleted file mode 100644
index ffd9126..0000000
--- a/play-services-location/res/drawable-xhdpi/powered_by_google_dark.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-xhdpi/powered_by_google_light.png b/play-services-location/res/drawable-xhdpi/powered_by_google_light.png
deleted file mode 100644
index d9f0593..0000000
--- a/play-services-location/res/drawable-xhdpi/powered_by_google_light.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-xxhdpi/powered_by_google_dark.png b/play-services-location/res/drawable-xxhdpi/powered_by_google_dark.png
deleted file mode 100644
index 0165a01..0000000
--- a/play-services-location/res/drawable-xxhdpi/powered_by_google_dark.png
+++ /dev/null
diff --git a/play-services-location/res/drawable-xxhdpi/powered_by_google_light.png b/play-services-location/res/drawable-xxhdpi/powered_by_google_light.png
deleted file mode 100644
index aa6b6db..0000000
--- a/play-services-location/res/drawable-xxhdpi/powered_by_google_light.png
+++ /dev/null
diff --git a/play-services-location/src/.gitkeep b/play-services-location/src/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/play-services-location/src/.gitkeep
+++ /dev/null