diff --git a/android/core/src/main/java/com/mongodb/stitch/android/core/internal/net/AndroidNetworkMonitor.java b/android/core/src/main/java/com/mongodb/stitch/android/core/internal/net/AndroidNetworkMonitor.java
index eaa3128f8..99fe39e26 100644
--- a/android/core/src/main/java/com/mongodb/stitch/android/core/internal/net/AndroidNetworkMonitor.java
+++ b/android/core/src/main/java/com/mongodb/stitch/android/core/internal/net/AndroidNetworkMonitor.java
@@ -21,6 +21,8 @@
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.os.AsyncTask;
+
 import com.mongodb.stitch.core.internal.net.NetworkMonitor;
 
 import java.util.HashSet;
@@ -56,9 +58,39 @@ public synchronized void removeNetworkStateListener(@Nonnull final StateListener
 
   @Override
   public void onReceive(final Context context, final Intent intent) {
-    final Set<StateListener> listenersCopy = new HashSet<>(listeners);
-    for (final StateListener listener : listenersCopy) {
-      listener.onNetworkStateChanged();
+    // Dispatch our network change callback to a background thread,
+    // since our listeners may block the main thread.
+    // See https://developer.android.com/guide/components/broadcasts#effects-process-state
+    final PendingResult pendingResult = goAsync();
+    final NetworkStateChangedTask asyncTask =
+        new NetworkStateChangedTask(pendingResult, new HashSet<>(listeners));
+    asyncTask.execute();
+  }
+
+  private static final class NetworkStateChangedTask extends AsyncTask<Void, Void, Void> {
+    private final Set<StateListener> listeners;
+    private final PendingResult pendingResult;
+
+    private NetworkStateChangedTask(
+        final PendingResult result,
+        final Set<StateListener> listeners
+    ) {
+      this.pendingResult = result;
+      this.listeners = listeners;
+    }
+
+    @Override
+    protected Void doInBackground(final Void... v) {
+      for (final StateListener listener: listeners) {
+        listener.onNetworkStateChanged();
+      }
+      return null;
+    }
+
+    @Override
+    protected void onPostExecute(final Void v) {
+      super.onPostExecute(v);
+      pendingResult.finish();
     }
   }
 }
diff --git a/android/examples/stress-tests/.gitignore b/android/examples/stress-tests/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/android/examples/stress-tests/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android/examples/stress-tests/build.gradle b/android/examples/stress-tests/build.gradle
new file mode 100644
index 000000000..d7cc0da0c
--- /dev/null
+++ b/android/examples/stress-tests/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.application'
+apply plugin: 'digital.wup.android-maven-publish'
+apply plugin: 'jacoco-android'
+
+buildscript {
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'digital.wup:android-maven-publish:3.3.0'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+    }
+}
+
+android {
+    compileSdkVersion target_api
+    defaultConfig {
+        minSdkVersion min_api
+        targetSdkVersion target_api
+    }
+}
+
+dependencies {
+    implementation project(':android:stitch-android-sdk')
+    implementation project(':android:android-services:stitch-android-services-mongodb-remote')
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.android.support:appcompat-v7:${support_library_version}"
+    implementation "com.android.support:recyclerview-v7:${support_library_version}"
+    implementation "com.android.support.constraint:constraint-layout:1.1.0"
+}
diff --git a/android/examples/stress-tests/proguard-rules.pro b/android/examples/stress-tests/proguard-rules.pro
new file mode 100644
index 000000000..f1b424510
--- /dev/null
+++ b/android/examples/stress-tests/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android/examples/stress-tests/src/main/AndroidManifest.xml b/android/examples/stress-tests/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..8c006d7cd
--- /dev/null
+++ b/android/examples/stress-tests/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mongodb.stitch.android.examples.stresstests">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/android/examples/stress-tests/src/main/java/com/mongodb/stitch/android/examples/stresstests/MainActivity.java b/android/examples/stress-tests/src/main/java/com/mongodb/stitch/android/examples/stresstests/MainActivity.java
new file mode 100644
index 000000000..cbbcae4c2
--- /dev/null
+++ b/android/examples/stress-tests/src/main/java/com/mongodb/stitch/android/examples/stresstests/MainActivity.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * 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.
+ */
+
+package com.mongodb.stitch.android.examples.stresstests;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.mongodb.stitch.android.core.Stitch;
+import com.mongodb.stitch.android.core.StitchAppClient;
+import com.mongodb.stitch.android.core.auth.StitchUser;
+import com.mongodb.stitch.android.services.mongodb.remote.RemoteMongoClient;
+import com.mongodb.stitch.android.services.mongodb.remote.RemoteMongoCollection;
+import com.mongodb.stitch.android.services.mongodb.remote.Sync;
+import com.mongodb.stitch.core.auth.providers.anonymous.AnonymousCredential;
+import com.mongodb.stitch.core.services.mongodb.remote.sync.DefaultSyncConflictResolvers;
+
+import java.util.ArrayList;
+import java.util.Locale;
+import java.util.Random;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+
+public class MainActivity extends AppCompatActivity {
+
+  private Button addSingleDocButton;
+  private Button addManyDocsButton;
+  private Button clearDocsButton;
+
+  private EditText etManyDocs;
+  private TextView label;
+
+  private StitchAppClient stitchAppClient;
+  private RemoteMongoCollection<Document> coll;
+  private Sync<Document> syncedColl;
+
+  private static final String TAG = MainActivity.class.getName();
+
+  private static final Random RANDOM = new Random();
+
+  private void initializeSync() {
+    stitchAppClient.getAuth().loginWithCredential(new AnonymousCredential()).addOnSuccessListener(
+        stitchUser -> {
+          coll = stitchAppClient
+              .getServiceClient(RemoteMongoClient.factory, "mongodb-atlas")
+              .getDatabase("stress")
+              .getCollection("tests");
+
+          syncedColl = coll.sync();
+          syncedColl.configure(
+              DefaultSyncConflictResolvers.remoteWins(),
+              (documentId, event) -> {
+                Log.i(TAG, String.format("Got event for doc %s: %s", documentId, event));
+                updateLabels();
+              },
+              (documentId, error) -> Log.e(
+                  TAG, String.format("Got sync error for doc %s: %s", documentId, error)
+              )
+          );
+          updateLabels();
+        });
+
+  }
+
+  private void updateLabels() {
+    syncedColl.getSyncedIds().addOnSuccessListener(syncedIds -> label.setText(String.format(
+        Locale.US,
+        "# of synced docs: %d",
+        syncedIds.size()
+    )));
+  }
+
+  private void syncNewDocument() {
+    final StitchUser user = stitchAppClient.getAuth().getUser();
+    if (user == null) {
+      return;
+    }
+    final Document docToInsert = new Document()
+        .append("_id", new ObjectId())
+        .append("owner_id", stitchAppClient.getAuth().getUser().getId())
+        .append("message", String.format(Locale.US, "%d", RANDOM.nextInt()));
+
+    syncedColl.insertOne(docToInsert).addOnCompleteListener(task -> updateLabels());
+  }
+
+  private void syncManyDocuments(final int numberOfDocs) {
+    final StitchUser user = stitchAppClient.getAuth().getUser();
+    if (user == null) {
+      return;
+    }
+
+    final ArrayList<Document> docsToInsert = new ArrayList<>();
+
+    for (int i = 0; i < numberOfDocs; ++i) {
+      final Document docToInsert = new Document()
+          .append("_id", new ObjectId())
+          .append("owner_id", stitchAppClient.getAuth().getUser().getId())
+          .append("message", String.format(Locale.US, "%d", RANDOM.nextInt()));
+
+      docsToInsert.add(docToInsert);
+    }
+
+    syncedColl.insertMany(docsToInsert).addOnCompleteListener(task -> updateLabels());
+  }
+
+  private void clearAllDocuments() {
+    final StitchUser user = stitchAppClient.getAuth().getUser();
+    if (user == null) {
+      return;
+    }
+
+    syncedColl.deleteMany(new Document()).addOnCompleteListener(task -> updateLabels());
+  }
+
+  @Override
+  protected void onCreate(final Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_main);
+
+    if (!Stitch.hasAppClient("stitch-tests-js-sdk-jntlj")) {
+      Stitch.initializeDefaultAppClient("stitch-tests-js-sdk-jntlj");
+    }
+
+    stitchAppClient = Stitch.getDefaultAppClient();
+    initializeSync();
+
+    addSingleDocButton = findViewById(R.id.button);
+    addManyDocsButton = findViewById(R.id.button3);
+    clearDocsButton = findViewById(R.id.button2);
+    etManyDocs = findViewById(R.id.numInput);
+
+    label = findViewById(R.id.textView);
+
+    addSingleDocButton.setOnClickListener(v -> syncNewDocument());
+
+    addManyDocsButton.setOnClickListener(v -> {
+      final int numberOfDocsToInsert = Integer.decode(etManyDocs.getText().toString());
+      syncManyDocuments(numberOfDocsToInsert);
+    });
+
+    clearDocsButton.setOnClickListener(v -> clearAllDocuments());
+  }
+}
diff --git a/android/examples/stress-tests/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/examples/stress-tests/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..1f6bb2906
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/android/examples/stress-tests/src/main/res/drawable/ic_launcher_background.xml b/android/examples/stress-tests/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 000000000..0d025f9bf
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#008577"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
diff --git a/android/examples/stress-tests/src/main/res/layout/activity_main.xml b/android/examples/stress-tests/src/main/res/layout/activity_main.xml
new file mode 100644
index 000000000..fbfd91762
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/layout/activity_main.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="96dp"
+        android:text="Hello World!"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="160dp"
+        android:layout_marginTop="164dp"
+        android:text="Add Single Doc"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="160dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="104dp"
+        android:text="Clear All Docs"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button3" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="84dp"
+        android:text="Add Many Docs"
+        app:layout_constraintStart_toEndOf="@+id/numInput"
+        app:layout_constraintTop_toBottomOf="@+id/button" />
+
+    <EditText
+        android:id="@+id/numInput"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ems="10"
+        android:inputType="number"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/button3" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..eca70cfe5
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 000000000..eca70cfe5
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher.png b/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..898f3ed59
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 000000000..dffca3601
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher.png b/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..64ba76f75
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 000000000..dae5e0823
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..e5ed46597
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..14ed0af35
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..b0907cac3
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..d8ae03154
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..2c18de9e6
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 000000000..beed3cdd2
Binary files /dev/null and b/android/examples/stress-tests/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/examples/stress-tests/src/main/res/values/colors.xml b/android/examples/stress-tests/src/main/res/values/colors.xml
new file mode 100644
index 000000000..69b22338c
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#D81B60</color>
+</resources>
diff --git a/android/examples/stress-tests/src/main/res/values/strings.xml b/android/examples/stress-tests/src/main/res/values/strings.xml
new file mode 100644
index 000000000..8aebb6d0a
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">stitch-android-examples-stress-tests</string>
+</resources>
diff --git a/android/examples/stress-tests/src/main/res/values/styles.xml b/android/examples/stress-tests/src/main/res/values/styles.xml
new file mode 100644
index 000000000..5885930df
--- /dev/null
+++ b/android/examples/stress-tests/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/android/examples/todo-sync/src/main/java/com/mongodb/stitch/android/examples/todosync/TodoListActivity.java b/android/examples/todo-sync/src/main/java/com/mongodb/stitch/android/examples/todosync/TodoListActivity.java
index bed2b0c80..69898ee99 100644
--- a/android/examples/todo-sync/src/main/java/com/mongodb/stitch/android/examples/todosync/TodoListActivity.java
+++ b/android/examples/todo-sync/src/main/java/com/mongodb/stitch/android/examples/todosync/TodoListActivity.java
@@ -50,7 +50,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.bson.BsonObjectId;
 import org.bson.BsonRegularExpression;
@@ -214,9 +213,11 @@ private void doLogin() {
           invalidateOptionsMenu();
           Toast.makeText(TodoListActivity.this, "Logged in", Toast.LENGTH_SHORT).show();
 
-          if (lists.sync().getSyncedIds().isEmpty()) {
-            lists.sync().insertOne(new Document("_id", userId));
-          }
+          lists.sync().getSyncedIds().addOnSuccessListener(syncedIds -> {
+            if (syncedIds.isEmpty()) {
+              lists.sync().insertOne(new Document("_id", userId));
+            }
+          });
         })
         .addOnFailureListener(e -> {
           invalidateOptionsMenu();
@@ -300,7 +301,6 @@ private Task<List<TodoItem>> getItemsFromServer() {
           if (!localTask.isSuccessful()) {
             return Tasks.forResult(Collections.emptyList());
           }
-          final Set<BsonValue> syncedIds = items.sync().getSyncedIds();
           final Map<ObjectId, TodoItem> localItems = new HashMap<>();
           for (final TodoItem item : localTask.getResult()) {
             localItems.put(item.getId(), item);
diff --git a/android/services/mongodb-remote/src/androidTest/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncMongoClientIntTests.kt b/android/services/mongodb-remote/src/androidTest/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncMongoClientIntTests.kt
index eb21a15d6..a811b7d61 100644
--- a/android/services/mongodb-remote/src/androidTest/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncMongoClientIntTests.kt
+++ b/android/services/mongodb-remote/src/androidTest/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncMongoClientIntTests.kt
@@ -72,12 +72,14 @@ class SyncMongoClientIntTests : BaseStitchAndroidIntTest(), SyncIntTestRunner {
             conflictResolver: ConflictHandler<Document?>,
             changeEventListener: ChangeEventListener<Document>?,
             exceptionListener: ExceptionListener?
-        ) {
-            sync.configure(conflictResolver, changeEventListener, exceptionListener)
+        ): Void? {
+            return Tasks.await(
+                sync.configure(conflictResolver, changeEventListener, exceptionListener)
+            )
         }
 
-        override fun syncOne(id: BsonValue) {
-            sync.syncOne(id)
+        override fun syncOne(id: BsonValue): Void? {
+            return Tasks.await(sync.syncOne(id))
         }
 
         override fun count(filter: Bson): Long {
@@ -112,12 +114,12 @@ class SyncMongoClientIntTests : BaseStitchAndroidIntTest(), SyncIntTestRunner {
             return Tasks.await(sync.deleteMany(filter))
         }
 
-        override fun desyncOne(id: BsonValue) {
-            sync.desyncOne(id)
+        override fun desyncOne(id: BsonValue): Void? {
+            return Tasks.await(sync.desyncOne(id))
         }
 
         override fun getSyncedIds(): Set<BsonValue> {
-            return sync.syncedIds
+            return Tasks.await(sync.syncedIds)
         }
 
         override fun find(filter: Bson): Iterable<Document?> {
@@ -125,11 +127,11 @@ class SyncMongoClientIntTests : BaseStitchAndroidIntTest(), SyncIntTestRunner {
         }
 
         override fun resumeSyncForDocument(documentId: BsonValue): Boolean {
-            return sync.resumeSyncForDocument(documentId)
+            return Tasks.await(sync.resumeSyncForDocument(documentId))
         }
 
         override fun getPausedDocumentIds(): Set<BsonValue> {
-            return sync.pausedDocumentIds
+            return Tasks.await(sync.pausedDocumentIds)
         }
     }
 
diff --git a/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/Sync.java b/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/Sync.java
index c36049726..39002e549 100644
--- a/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/Sync.java
+++ b/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/Sync.java
@@ -43,49 +43,70 @@
  */
 public interface Sync<DocumentT> {
   /**
-   * Set the conflict handler and and change event listener on this collection.
+   * Set the conflict handler and and change event listener on this collection. This will start
+   * a background sync thread, and should be called before any CRUD operations are attempted.
+   *
    * @param conflictHandler the conflict resolver to invoke when a conflict happens between local
    *                         and remote events.
    * @param changeEventListener the event listener to invoke when a change event happens for the
    *                         document.
    * @param exceptionListener the error listener to invoke when an irrecoverable error occurs
+   *
+   * @return A Task that completes when Mobile Sync is configured, and the background sync thread
+   *         has started.
    */
-  void configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
-                 @Nullable final ChangeEventListener<DocumentT> changeEventListener,
-                 @Nullable final ExceptionListener exceptionListener);
+  Task<Void> configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
+                       @Nullable final ChangeEventListener<DocumentT> changeEventListener,
+                       @Nullable final ExceptionListener exceptionListener);
 
   /**
    * Requests that the given document _id be synchronized.
    * @param id the document _id to synchronize.
+   *
+   * @return a Task that completes when the specified document ID is configured as synced. The
+   *         actual document may not be in sync with the remote collection until the next sync
+   *         pass.
    */
-  void syncOne(final BsonValue id);
+  Task<Void> syncOne(final BsonValue id);
 
   /**
    * Requests that the given document _ids be synchronized.
    * @param ids the document _ids to synchronize.
+   *
+   * @return a Task that completes when the specified document IDs are configured as synced. The
+   *         actual documents may not be in sync with the remote collection until the next sync
+   *         pass.
    */
-  void syncMany(final BsonValue... ids);
+  Task<Void> syncMany(final BsonValue... ids);
 
   /**
    * Stops synchronizing the given document _id. Any uncommitted writes will be lost.
    *
    * @param id the _id of the document to desynchronize.
+   *
+   * @return a Task that completes when the specified document ID is no longer configured as
+   *         synced. The document will be removed from the local collection, but it will not be
+   *         necessarily deleted from the remote collection.
    */
-  void desyncOne(final BsonValue id);
+  Task<Void> desyncOne(final BsonValue id);
 
   /**
    * Stops synchronizing the given document _ids. Any uncommitted writes will be lost.
    *
    * @param ids the _ids of the documents to desynchronize.
+   *
+   * @return a Task that completes when the specified document ID is no longer configured as
+   *         synced. The documents will be removed from the local collection, but they are not
+   *         necessarily deleted from the remote collection.
    */
-  void desyncMany(final BsonValue... ids);
+  Task<Void> desyncMany(final BsonValue... ids);
 
   /**
    * Returns the set of synchronized document ids in a namespace.
    *
    * @return the set of synchronized document ids in a namespace.
    */
-  Set<BsonValue> getSyncedIds();
+  Task<Set<BsonValue>> getSyncedIds();
 
   /**
    * Return the set of synchronized document _ids in a namespace
@@ -93,7 +114,7 @@ void configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
    *
    * @return the set of paused document _ids in a namespace
    */
-  Set<BsonValue> getPausedDocumentIds();
+  Task<Set<BsonValue>> getPausedDocumentIds();
 
   /**
    * A document that is paused no longer has remote updates applied to it.
@@ -104,7 +125,7 @@ void configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
    * @return true if successfully resumed, false if the document
    *         could not be found or there was an error resuming
    */
-  boolean resumeSyncForDocument(@NonNull final BsonValue documentId);
+  Task<Boolean> resumeSyncForDocument(@NonNull final BsonValue documentId);
 
   /**
    * Counts the number of documents in the collection that have been synchronized with the remote.
diff --git a/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncImpl.java b/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncImpl.java
index 0e362de61..070b684c6 100644
--- a/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncImpl.java
+++ b/android/services/mongodb-remote/src/main/java/com/mongodb/stitch/android/services/mongodb/remote/internal/SyncImpl.java
@@ -54,45 +54,90 @@ public class SyncImpl<DocumentT> implements Sync<DocumentT> {
   }
 
   @Override
-  public void configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
-                        @Nullable final ChangeEventListener<DocumentT> changeEventListener,
-                        @Nullable final ExceptionListener exceptionListener) {
-    this.proxy.configure(conflictHandler, changeEventListener, exceptionListener);
+  public Task<Void> configure(@NonNull final ConflictHandler<DocumentT> conflictHandler,
+                              @Nullable final ChangeEventListener<DocumentT> changeEventListener,
+                              @Nullable final ExceptionListener exceptionListener) {
+    return this.dispatcher.dispatchTask(new Callable<Void>() {
+      @Override
+      public Void call() throws Exception {
+        SyncImpl.this.proxy.configure(conflictHandler, changeEventListener, exceptionListener);
+        return null;
+      }
+    });
   }
 
   @Override
-  public void syncOne(final BsonValue id) {
-    proxy.syncOne(id);
+  public Task<Void> syncOne(final BsonValue id) {
+    return this.dispatcher.dispatchTask(new Callable<Void>() {
+      @Override
+      public Void call() throws Exception {
+        proxy.syncOne(id);
+        return null;
+      }
+    });
   }
 
   @Override
-  public void syncMany(final BsonValue... ids) {
-    proxy.syncMany(ids);
+  public Task<Void> syncMany(final BsonValue... ids) {
+    return this.dispatcher.dispatchTask(new Callable<Void>() {
+      @Override
+      public Void call() throws Exception {
+        proxy.syncMany(ids);
+        return null;
+      }
+    });
   }
 
   @Override
-  public void desyncOne(final BsonValue id) {
-    proxy.desyncOne(id);
+  public Task<Void> desyncOne(final BsonValue id) {
+    return this.dispatcher.dispatchTask(new Callable<Void>() {
+      @Override
+      public Void call() throws Exception {
+        proxy.desyncOne(id);
+        return null;
+      }
+    });
   }
 
   @Override
-  public void desyncMany(final BsonValue... ids) {
-    proxy.desyncMany(ids);
+  public Task<Void> desyncMany(final BsonValue... ids) {
+    return this.dispatcher.dispatchTask(new Callable<Void>() {
+      @Override
+      public Void call() throws Exception {
+        proxy.desyncMany(ids);
+        return null;
+      }
+    });
   }
 
   @Override
-  public Set<BsonValue> getSyncedIds() {
-    return this.proxy.getSyncedIds();
+  public Task<Set<BsonValue>> getSyncedIds() {
+    return this.dispatcher.dispatchTask(new Callable<Set<BsonValue>>() {
+      @Override
+      public Set<BsonValue> call() throws Exception {
+        return SyncImpl.this.proxy.getSyncedIds();
+      }
+    });
   }
 
   @Override
-  public Set<BsonValue> getPausedDocumentIds() {
-    return this.proxy.getPausedDocumentIds();
+  public Task<Set<BsonValue>> getPausedDocumentIds() {
+    return this.dispatcher.dispatchTask(new Callable<Set<BsonValue>>() {
+      @Override
+      public Set<BsonValue> call() throws Exception {
+        return SyncImpl.this.proxy.getPausedDocumentIds();
+      }
+    });
   }
 
   @Override
-  public boolean resumeSyncForDocument(@NonNull final BsonValue documentId) {
-    return this.proxy.resumeSyncForDocument(documentId);
+  public Task<Boolean> resumeSyncForDocument(@NonNull final BsonValue documentId) {
+    return this.dispatcher.dispatchTask(new Callable<Boolean>() {
+      @Override
+      public Boolean call() throws Exception {
+        return SyncImpl.this.proxy.resumeSyncForDocument(documentId);
+      }
+    });
   }
 
   @Override
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/DataSynchronizer.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/DataSynchronizer.java
index 5815a267a..6afdaf478 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/DataSynchronizer.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/DataSynchronizer.java
@@ -57,6 +57,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -65,6 +66,7 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import javax.annotation.Nonnull;
@@ -515,6 +517,12 @@ public boolean doSyncPass() {
           Locale.US,
           "t='%d': doSyncPass END",
           logicalT));
+    } catch (InterruptedException e) {
+      logger.info(String.format(
+          Locale.US,
+          "t='%d': doSyncPass INTERRUPTED",
+          logicalT));
+      return false;
     } finally {
       syncLock.unlock();
     }
@@ -529,14 +537,20 @@ public boolean doSyncPass() {
    * latest documents with the remote. Any conflicts that occur will be resolved locally and
    * later relayed remotely on a subsequent iteration of {@link DataSynchronizer#doSyncPass()}.
    */
-  private void syncRemoteToLocal() {
-    logger.info(String.format(
+  private void syncRemoteToLocal() throws InterruptedException {
+    logger.debug(String.format(
         Locale.US,
         "t='%d': syncRemoteToLocal START",
         logicalT));
 
     // 2. Run remote to local (R2L) sync routine
     for (final NamespaceSynchronizationConfig nsConfig : syncConfig) {
+      // lock the NamespaceChangeStreamListener for this namespace to prevent a new stream from
+      // opening for this namespace during this sync pass.
+      final ReadWriteLock streamerLock = instanceChangeStreamListener
+          .getLockForNamespace(nsConfig.getNamespace());
+
+      streamerLock.writeLock().lock();
       nsConfig.getLock().writeLock().lock();
       try {
         final Map<BsonValue, ChangeEvent<BsonDocument>> remoteChangeEvents =
@@ -555,7 +569,7 @@ private void syncRemoteToLocal() {
         // a. For each unprocessed change event
         for (final Map.Entry<BsonValue, ChangeEvent<BsonDocument>> eventEntry :
             remoteChangeEvents.entrySet()) {
-          logger.info(String.format(
+          logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteToLocal consuming event of type: %s",
               logicalT,
@@ -597,11 +611,11 @@ private void syncRemoteToLocal() {
                     latestDocumentMap.get(docId),
                     false
                 ));
-
-            docConfig.setStale(false);
           }
         }
 
+        nsConfig.setStale(false);
+
         // For synchronized documents that had no unprocessed change event, and did not have a
         // latest version when stale documents were queried, synthesize a remote delete event to
         // delete the local document.
@@ -631,10 +645,11 @@ private void syncRemoteToLocal() {
         }
       } finally {
         nsConfig.getLock().writeLock().unlock();
+        streamerLock.writeLock().unlock();
       }
     }
 
-    logger.info(String.format(
+    logger.debug(String.format(
         Locale.US,
         "t='%d': syncRemoteToLocal END",
         logicalT));
@@ -653,7 +668,7 @@ private void syncRemoteChangeEventToLocal(
       final ChangeEvent<BsonDocument> remoteChangeEvent
   ) {
     if (docConfig.hasUncommittedWrites() && docConfig.getLastResolution() == logicalT) {
-      logger.info(String.format(
+      logger.debug(String.format(
           Locale.US,
           "t='%d': syncRemoteChangeEventToLocal have writes for %s but happened at same t; "
               + "waiting until next pass",
@@ -662,7 +677,7 @@ private void syncRemoteChangeEventToLocal(
       return;
     }
 
-    logger.info(String.format(
+    logger.debug(String.format(
         Locale.US,
         "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s processing remote operation='%s'",
         logicalT,
@@ -713,7 +728,7 @@ private void syncRemoteChangeEventToLocal(
     //     been applied to the local collection.
     if (docConfig.hasCommittedVersion(currentRemoteVersionInfo)) {
       // Skip this event since we generated it.
-      logger.info(String.format(
+      logger.debug(String.format(
           Locale.US,
           "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s remote change event was "
               + "generated by us; dropping the event",
@@ -731,7 +746,7 @@ private void syncRemoteChangeEventToLocal(
         case REPLACE:
         case UPDATE:
         case INSERT:
-          logger.info(String.format(
+          logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s replacing local with "
                   + "remote document with new version as there are no local pending writes: %s",
@@ -746,7 +761,7 @@ private void syncRemoteChangeEventToLocal(
               DocumentVersionInfo.getDocumentVersionDoc(remoteChangeEvent.getFullDocument()));
           return;
         case DELETE:
-          logger.info(String.format(
+          logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s deleting local as "
                   + "there are no local pending writes",
@@ -785,7 +800,7 @@ private void syncRemoteChangeEventToLocal(
     //    with no version indicates a document that may have been committed by another client not
     //    adhering to the mobile sync protocol.
     if (!lastKnownLocalVersionInfo.hasVersion() || !currentRemoteVersionInfo.hasVersion()) {
-      logger.info(String.format(
+      logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s remote or local have an "
                       + "empty version but a write is pending; raising conflict",
@@ -805,7 +820,7 @@ private void syncRemoteChangeEventToLocal(
       if (remoteVersion.versionCounter <= localVersion.versionCounter) {
         // i. drop the event if the version counter of the remote event less than or equal to the
         // version counter of the local document
-        logger.info(String.format(
+        logger.debug(String.format(
                 Locale.US,
                 "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s remote change event "
                         + "is stale; dropping the event",
@@ -816,7 +831,7 @@ private void syncRemoteChangeEventToLocal(
       } else {
         // ii. raise a conflict if the version counter of the remote event is greater than the
         //     version counter of the local document
-        logger.info(String.format(
+        logger.debug(String.format(
                 Locale.US,
                 "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s remote event version "
                         + "has higher counter than local version but a write is pending; "
@@ -842,7 +857,7 @@ private void syncRemoteChangeEventToLocal(
       // i. If the document is not found with a remote lookup, this means the document was
       //    deleted remotely, so raise a conflict using a synthesized delete event as the remote
       //    change event.
-      logger.info(String.format(
+      logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s remote event version "
                       + "stale and latest document lookup indicates a remote delete occurred, but "
@@ -886,7 +901,7 @@ private void syncRemoteChangeEventToLocal(
             && newestRemoteVersionInfo.getVersion().getInstanceId()
                     .equals(localVersion.instanceId)) {
 
-      logger.info(String.format(
+      logger.debug(String.format(
               Locale.US,
               "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s latest document lookup "
                       + "indicates that this is a stale event; dropping the event",
@@ -901,7 +916,7 @@ private void syncRemoteChangeEventToLocal(
     //      document, raise a conflict using a synthesized replace event as the remote change
     //      event. This means the remote document is a legitimately new document and we should
     //      handle the conflict.
-    logger.info(String.format(
+    logger.debug(String.format(
             Locale.US,
             "t='%d': syncRemoteChangeEventToLocal ns=%s documentId=%s latest document lookup "
                     + "indicates a remote replace occurred, but a local write is pending; raising "
@@ -925,7 +940,7 @@ private void syncRemoteChangeEventToLocal(
    * remotely on a subsequent iteration of {@link DataSynchronizer#doSyncPass()}.
    */
   private void syncLocalToRemote() {
-    logger.info(String.format(
+    logger.debug(String.format(
         Locale.US,
         "t='%d': syncLocalToRemote START",
         logicalT));
@@ -933,6 +948,12 @@ private void syncLocalToRemote() {
     // 1. Run local to remote (L2R) sync routine
     // Search for modifications in each namespace.
     for (final NamespaceSynchronizationConfig nsConfig : syncConfig) {
+      // lock the NamespaceChangeStreamListener for this namespace to prevent a new stream from
+      // opening for this namespace during this sync pass.
+      final ReadWriteLock streamerLock = instanceChangeStreamListener
+          .getLockForNamespace(nsConfig.getNamespace());
+
+      streamerLock.writeLock().lock();
       nsConfig.getLock().writeLock().lock();
       try {
         final CoreRemoteMongoCollection<BsonDocument> remoteColl =
@@ -944,7 +965,7 @@ private void syncLocalToRemote() {
             continue;
           }
           if (docConfig.getLastResolution() == logicalT) {
-            logger.info(String.format(
+            logger.debug(String.format(
                 Locale.US,
                 "t='%d': syncLocalToRemote ns=%s documentId=%s has writes from current logicalT; "
                     + "waiting until next pass",
@@ -957,7 +978,7 @@ private void syncLocalToRemote() {
           // i. Retrieve the change event for this local document in the local config metadata
           final ChangeEvent<BsonDocument> localChangeEvent =
               docConfig.getLastUncommittedChangeEvent();
-          logger.info(String.format(
+          logger.debug(String.format(
               Locale.US,
               "t='%d': syncLocalToRemote ns=%s documentId=%s processing local operation='%s'",
               logicalT,
@@ -1010,7 +1031,7 @@ private void syncLocalToRemote() {
             //    greater than the local version counter, or if both versions are empty.
             if (!docConfig.hasCommittedVersion(unprocessedEventVersion)) {
               isConflicted = true;
-              logger.info(String.format(
+              logger.debug(String.format(
                   Locale.US,
                   "t='%d': syncLocalToRemote ns=%s documentId=%s version different on "
                       + "unprocessed change event for document; raising conflict",
@@ -1055,7 +1076,7 @@ private void syncLocalToRemote() {
                   }
 
                   // ii. Otherwise record that a conflict has occurred.
-                  logger.info(String.format(
+                  logger.debug(String.format(
                       Locale.US,
                       "t='%d': syncLocalToRemote ns=%s documentId=%s duplicate key exception on "
                           + "insert; raising conflict",
@@ -1111,7 +1132,7 @@ private void syncLocalToRemote() {
                 // c. If no documents are matched, record that a conflict has occurred.
                 if (result.getMatchedCount() == 0) {
                   isConflicted = true;
-                  logger.info(String.format(
+                  logger.debug(String.format(
                       Locale.US,
                       "t='%d': syncLocalToRemote ns=%s documentId=%s version different on "
                           + "replaced document or document deleted; raising conflict",
@@ -1141,7 +1162,7 @@ private void syncLocalToRemote() {
                         && localUpdateDescription.getUpdatedFields().isEmpty()) {
                   // if the translated update is empty, then this update is a noop, and we
                   // shouldn't update because it would improperly update the version information.
-                  logger.info(String.format(
+                  logger.debug(String.format(
                           Locale.US,
                           "t='%d': syncLocalToRemote ns=%s documentId=%s local change event "
                                   + "update description is empty for UPDATE; dropping the event",
@@ -1207,7 +1228,7 @@ private void syncLocalToRemote() {
                 if (result.getMatchedCount() == 0) {
                   // c. If no documents are matched, record that a conflict has occurred.
                   isConflicted = true;
-                  logger.info(String.format(
+                  logger.debug(String.format(
                       Locale.US,
                       "t='%d': syncLocalToRemote ns=%s documentId=%s version different on "
                           + "updated document or document deleted; raising conflict",
@@ -1247,7 +1268,7 @@ private void syncLocalToRemote() {
                   remoteDocumentFetched = true;
                   if (remoteDocument != null) {
                     isConflicted = true;
-                    logger.info(String.format(
+                    logger.debug(String.format(
                         Locale.US,
                         "t='%d': syncLocalToRemote ns=%s documentId=%s version different on "
                             + "removed document; raising conflict",
@@ -1283,7 +1304,7 @@ private void syncLocalToRemote() {
             nextVersion = null;
           }
 
-          logger.info(String.format(
+          logger.debug(String.format(
               Locale.US,
               "t='%d': syncLocalToRemote ns=%s documentId=%s conflict=%s",
               logicalT,
@@ -1331,10 +1352,11 @@ private void syncLocalToRemote() {
         }
       } finally {
         nsConfig.getLock().writeLock().unlock();
+        streamerLock.writeLock().unlock();
       }
     }
 
-    logger.info(String.format(
+    logger.debug(String.format(
         Locale.US,
         "t='%d': syncLocalToRemote END",
         logicalT));
@@ -1398,7 +1420,7 @@ private void resolveConflict(
       return;
     }
 
-    logger.info(String.format(
+    logger.debug(String.format(
         Locale.US,
         "t='%d': resolveConflict ns=%s documentId=%s resolving conflict between localOp=%s "
             + "remoteOp=%s",
@@ -1476,7 +1498,7 @@ private void resolveConflict(
 
     // a. If the resolved document is null:
     if (resolvedDocument == null) {
-      logger.info(String.format(
+      logger.debug(String.format(
           Locale.US,
           "t='%d': resolveConflict ns=%s documentId=%s deleting local and remote with remote "
               + "version acknowledged",
@@ -1503,7 +1525,7 @@ private void resolveConflict(
               resolvedDocument,
               syncConfig.getNamespaceConfig(namespace).getDocumentCodec());
 
-      logger.info(String.format(
+      logger.debug(String.format(
           Locale.US,
           "t='%d': resolveConflict ns=%s documentId=%s replacing local with resolved document "
                   + "with remote version acknowledged: %s",
@@ -2764,17 +2786,16 @@ private CoreRemoteMongoCollection<BsonDocument> getRemoteCollection(
   private Set<BsonDocument> getLatestDocumentsForStaleFromRemote(
       final NamespaceSynchronizationConfig nsConfig,
       final Set<BsonValue> staleIds) {
+
     final BsonArray ids = new BsonArray();
-    for (final BsonValue bsonValue : staleIds) {
-      ids.add(new BsonDocument("_id", bsonValue));
-    }
+    Collections.addAll(ids, staleIds.toArray(new BsonValue[0]));
 
     if (ids.size() == 0) {
       return new HashSet<>();
     }
 
     return this.getRemoteCollection(nsConfig.getNamespace()).find(
-        new Document("$or", ids)
+        new Document("_id", new Document("$in", ids))
     ).into(new HashSet<>());
   }
 
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListener.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListener.java
index b29bb91ed..514483aa0 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListener.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListener.java
@@ -21,7 +21,9 @@
 import com.mongodb.stitch.core.services.mongodb.remote.ChangeEvent;
 
 import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.bson.BsonDocument;
@@ -90,6 +92,17 @@ void removeWatcher(final MongoNamespace namespace,
   Map<BsonValue, ChangeEvent<BsonDocument>> getEventsForNamespace(
       final MongoNamespace namespace);
 
+  /**
+   * Returns the lock for the NamespaceChangeStreamListener for a given namespace. If no listener
+   * exists yet for this namespace, a lock will still be provided, and it will be the lock used
+   * when that NamespaceChangeStreamListener is created. This lock should be taken if the stream
+   * needs to be prevented from opening or processing events
+   *
+   * @param namespace the namespace to get a lock for.
+   * @return a ReadWriteLock for the given namespace
+   */
+  @Nonnull ReadWriteLock getLockForNamespace(final MongoNamespace namespace);
+
   /**
    * If there is an unprocessed change event for a particular document ID, fetch it from the
    * appropriate namespace change stream listener, and remove it. By reading the event here, we are
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListenerImpl.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListenerImpl.java
index 630859560..f765f5514 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListenerImpl.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceChangeStreamListenerImpl.java
@@ -25,9 +25,12 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.bson.BsonDocument;
@@ -37,6 +40,7 @@
 final class InstanceChangeStreamListenerImpl implements InstanceChangeStreamListener {
 
   private final Map<MongoNamespace, NamespaceChangeStreamListener> nsStreamers;
+  private final ConcurrentMap<MongoNamespace, ReadWriteLock> nsListenerLocks;
   private final ReadWriteLock instanceLock;
   private final InstanceSynchronizationConfig instanceConfig;
   private final CoreStitchServiceClient service;
@@ -54,6 +58,7 @@ final class InstanceChangeStreamListenerImpl implements InstanceChangeStreamList
     this.networkMonitor = networkMonitor;
     this.authMonitor = authMonitor;
     this.nsStreamers = new HashMap<>();
+    this.nsListenerLocks = new ConcurrentHashMap<>();
     this.instanceLock = new ReentrantReadWriteLock();
   }
 
@@ -167,7 +172,8 @@ public void addNamespace(final MongoNamespace namespace) {
               instanceConfig.getNamespaceConfig(namespace),
               service,
               networkMonitor,
-              authMonitor);
+              authMonitor,
+              getLockForNamespace(namespace));
       this.nsStreamers.put(namespace, streamer);
     } finally {
       this.instanceLock.writeLock().unlock();
@@ -216,6 +222,22 @@ public Map<BsonValue, ChangeEvent<BsonDocument>> getEventsForNamespace(
     return streamer.getEvents();
   }
 
+  public @Nonnull ReadWriteLock getLockForNamespace(final MongoNamespace namespace) {
+    this.instanceLock.readLock().lock();
+    ReadWriteLock streamerLock;
+    try {
+      streamerLock = nsListenerLocks.get(namespace);
+      if (streamerLock == null) {
+        streamerLock = new ReentrantReadWriteLock();
+        nsListenerLocks.put(namespace, streamerLock);
+      }
+
+      return streamerLock;
+    } finally {
+      this.instanceLock.readLock().unlock();
+    }
+  }
+
   /**
    * If there is an unprocessed change event for a particular document ID, fetch it from the
    * appropriate namespace change stream listener, and remove it. By reading the event here, we are
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceSynchronizationConfig.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceSynchronizationConfig.java
index 5ec951b55..efc7a6930 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceSynchronizationConfig.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/InstanceSynchronizationConfig.java
@@ -64,12 +64,28 @@ class InstanceSynchronizationConfig
         Indexes.ascending(
             NamespaceSynchronizationConfig.ConfigCodec.Fields.NAMESPACE_FIELD),
         new IndexOptions().unique(true));
+
     this.docsColl.createIndex(
         Indexes.ascending(
             CoreDocumentSynchronizationConfig.ConfigCodec.Fields.NAMESPACE_FIELD,
             CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD),
         new IndexOptions().unique(true));
 
+    // used to scan for stale documents when the namespace is marked as not stale,
+    this.docsColl.createIndex(
+        Indexes.ascending(
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.NAMESPACE_FIELD,
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE,
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD));
+
+    // used to scan for unpaused documents when the whole namespace is marked as stale
+    this.docsColl.createIndex(
+        Indexes.ascending(
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.NAMESPACE_FIELD,
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_PAUSED,
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD)
+    );
+
     this.instanceLock = new ReentrantReadWriteLock();
 
     this.namespaces = new HashMap<>();
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceChangeStreamListener.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceChangeStreamListener.java
index ef51886e3..7e035dc45 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceChangeStreamListener.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceChangeStreamListener.java
@@ -38,7 +38,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.annotation.Nullable;
 
@@ -70,7 +69,8 @@ public class NamespaceChangeStreamListener implements Closeable {
       final NamespaceSynchronizationConfig nsConfig,
       final CoreStitchServiceClient service,
       final NetworkMonitor networkMonitor,
-      final AuthMonitor authMonitor
+      final AuthMonitor authMonitor,
+      final ReadWriteLock nsLock
   ) {
     this.namespace = namespace;
     this.nsConfig = nsConfig;
@@ -78,7 +78,7 @@ public class NamespaceChangeStreamListener implements Closeable {
     this.networkMonitor = networkMonitor;
     this.authMonitor = authMonitor;
     this.events = new HashMap<>();
-    this.nsLock = new ReentrantReadWriteLock();
+    this.nsLock = nsLock;
     this.logger =
         Loggers.getLogger(
             String.format("NamespaceChangeStreamListener-%s", namespace.toString()));
diff --git a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceSynchronizationConfig.java b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceSynchronizationConfig.java
index 2b570e2b4..acdefc77d 100644
--- a/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceSynchronizationConfig.java
+++ b/core/services/mongodb-remote/src/main/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/NamespaceSynchronizationConfig.java
@@ -196,12 +196,28 @@ public Set<BsonValue> getSynchronizedDocumentIds() throws InterruptedException {
   Set<BsonValue> getStaleDocumentIds() {
     nsLock.readLock().lock();
     try {
-      final DistinctIterable<BsonValue> staleDocIds = this.docsColl.distinct(
-          CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD,
-          new BsonDocument(
-              CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE, BsonBoolean.TRUE),
-          BsonValue.class);
-      return staleDocIds.into(new HashSet<>());
+      if (this.namespacesColl.count(
+          getNsFilter(getNamespace())
+              .append(ConfigCodec.Fields.IS_STALE, new BsonBoolean(true))
+      ) != 0) {
+        // If the entire namespace is stale, return all the document ids in the namespace that
+        // are not paused.
+        final DistinctIterable<BsonValue> unpausedStaleDocIds = this.docsColl.distinct(
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD,
+            getNsFilter(getNamespace()).append(
+                CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_PAUSED, BsonBoolean.FALSE),
+            BsonValue.class);
+        return unpausedStaleDocIds.into(new HashSet<>());
+      } else {
+        // Return just the stale documents that have been marked stale because they were
+        // individually unpaused and marked as stale.
+        final DistinctIterable<BsonValue> staleDocIds = this.docsColl.distinct(
+            CoreDocumentSynchronizationConfig.ConfigCodec.Fields.DOCUMENT_ID_FIELD,
+            getNsFilter(getNamespace()).append(
+                CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE, BsonBoolean.TRUE),
+            BsonValue.class);
+        return staleDocIds.into(new HashSet<>());
+      }
     } finally {
       nsLock.readLock().unlock();
     }
@@ -260,12 +276,28 @@ public ConflictHandler getConflictHandler() {
   void setStale(final boolean stale) throws InterruptedException {
     nsLock.writeLock().lockInterruptibly();
     try {
-      docsColl.updateMany(
+      namespacesColl.updateOne(
           getNsFilter(getNamespace()),
           new BsonDocument("$set",
               new BsonDocument(
-                  CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE,
-                  new BsonBoolean(stale))));
+                  ConfigCodec.Fields.IS_STALE,
+                  new BsonBoolean(stale)
+              )));
+
+      // if we're setting stale to be false, also mark any documents that were individually marked
+      // as stale to not stale
+      if (!stale) {
+        docsColl.updateMany(
+            getNsFilter(getNamespace())
+                .append(
+                    CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE,
+                    BsonBoolean.TRUE),
+            new BsonDocument("$set",
+                new BsonDocument(
+                    CoreDocumentSynchronizationConfig.ConfigCodec.Fields.IS_STALE,
+                    BsonBoolean.FALSE))
+        );
+      }
     } catch (IllegalStateException e) {
       // eat this
     } finally {
@@ -348,6 +380,7 @@ public Class<NamespaceSynchronizationConfig> getEncoderClass() {
     static class Fields {
       static final String NAMESPACE_FIELD = "namespace";
       static final String SCHEMA_VERSION_FIELD = "schema_version";
+      static final String IS_STALE = "is_stale";
     }
   }
 }
diff --git a/core/services/mongodb-remote/src/test/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/SyncUnitTestHarness.kt b/core/services/mongodb-remote/src/test/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/SyncUnitTestHarness.kt
index a36e0d6af..8ee04eb93 100644
--- a/core/services/mongodb-remote/src/test/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/SyncUnitTestHarness.kt
+++ b/core/services/mongodb-remote/src/test/java/com/mongodb/stitch/core/services/mongodb/remote/sync/internal/SyncUnitTestHarness.kt
@@ -60,6 +60,7 @@ import java.util.Random
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantLock
+import java.util.concurrent.locks.ReentrantReadWriteLock
 
 class SyncUnitTestHarness : Closeable {
     companion object {
@@ -759,7 +760,8 @@ class SyncUnitTestHarness : Closeable {
             nsConfigMock,
             (context as DataSynchronizerTestContextImpl).service,
             context.networkMonitor,
-            context.authMonitor)
+            context.authMonitor,
+            ReentrantReadWriteLock())
 
         return namespaceChangeStreamListener to nsConfigMock
     }
diff --git a/core/testutils/src/main/java/com/mongodb/stitch/core/testutils/sync/ProxySyncMethods.kt b/core/testutils/src/main/java/com/mongodb/stitch/core/testutils/sync/ProxySyncMethods.kt
index 40e90aea7..372029911 100644
--- a/core/testutils/src/main/java/com/mongodb/stitch/core/testutils/sync/ProxySyncMethods.kt
+++ b/core/testutils/src/main/java/com/mongodb/stitch/core/testutils/sync/ProxySyncMethods.kt
@@ -22,11 +22,11 @@ interface ProxySyncMethods {
         conflictResolver: ConflictHandler<Document?>,
         changeEventListener: ChangeEventListener<Document>?,
         exceptionListener: ExceptionListener?
-    )
+    ): Void?
 
-    fun syncOne(id: BsonValue)
+    fun syncOne(id: BsonValue): Void?
 
-    fun desyncOne(id: BsonValue)
+    fun desyncOne(id: BsonValue): Void?
 
     fun getSyncedIds(): Set<BsonValue>
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d1d..41fddb7bc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Mar 04 17:44:14 EST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
diff --git a/settings.gradle b/settings.gradle
index 85c726970..d0e4921af 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -39,6 +39,7 @@ include ':core:sdk',
         ':android:services:mongodb-remote',
         ':android:services:twilio',
         ':android:examples:fcm',
+        ':android:examples:stress-tests',
         ':android:examples:todo',
         ':android:examples:todo-sync',
         ':android:testutils'
@@ -83,4 +84,5 @@ project(':android:services:twilio').name = 'stitch-android-services-twilio'
 project(':android:examples:fcm').name = 'stitch-android-examples-fcm'
 project(':android:examples:todo').name = 'stitch-android-examples-todo'
 project(':android:examples:todo-sync').name = 'stitch-android-examples-todo-sync'
+project(':android:examples:stress-tests').name = 'stitch-android-examples-stress-tests'
 project(':android:testutils').name = 'stitch-android-testutils'