diff --git a/build.gradle b/build.gradle
index c43b7ae32f0..f408825f930 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,8 +45,8 @@ apply from: "gradle/errorProne.gradle"
 ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '28.0.0'
-    googleTruthVersion = '0.45'
-    grpcVersion = '1.41.0'
+    googleTruthVersion = '1.1.2'
+    grpcVersion = '1.44.1'
     robolectricVersion = '4.3.1'
     protocVersion = '3.14.0'
     javaliteVersion = '3.14.0'
diff --git a/firebase-database/src/test/java/com/google/firebase/database/util/ComparatorTester.java b/firebase-database/src/test/java/com/google/firebase/database/util/ComparatorTester.java
index 9afe2e80bd4..9e574865dd8 100644
--- a/firebase-database/src/test/java/com/google/firebase/database/util/ComparatorTester.java
+++ b/firebase-database/src/test/java/com/google/firebase/database/util/ComparatorTester.java
@@ -180,7 +180,7 @@ private void testNullCompare(Object obj) {
     if (comparator == null) {
       try {
         compare(obj, null);
-        assert_().fail("Expected NullPointerException in %s.compare(null)", obj);
+        assert_().withMessage("Expected NullPointerException in %s.compare(null)", obj).fail();
       } catch (NullPointerException expected) {
         // TODO: Consider accepting JavaScriptException under GWT
       }
@@ -192,7 +192,9 @@ private void testClassCast(Object obj) {
     if (comparator == null) {
       try {
         compare(obj, ICanNotBeCompared.INSTANCE);
-        assert_().fail("Expected ClassCastException in %s.compareTo(otherObject)", obj);
+        assert_()
+            .withMessage("Expected ClassCastException in %s.compareTo(otherObject)", obj)
+            .fail();
       } catch (ClassCastException expected) {
       }
     }
diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
index 9ce32df41f1..696d0b46633 100644
--- a/firebase-firestore/CHANGELOG.md
+++ b/firebase-firestore/CHANGELOG.md
@@ -3,6 +3,8 @@ by opting into a release at
 [go/firebase-android-release](http:go/firebase-android-release) (Googlers only).
 
 # 24.0.2
+- [fixed] Fixed an issue of long grpc reconnection period, when App moves to
+  foreground after staying in background for a while.
 - [fixed] Fixed an AppCheck issue that caused Firestore listeners to stop
   working and receive a "Permission Denied" error. This issue only occurred for
   AppCheck users that set their expiration time to under an hour.
diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle
index 5c2797dea8e..6be15dbad61 100644
--- a/firebase-firestore/firebase-firestore.gradle
+++ b/firebase-firestore/firebase-firestore.gradle
@@ -111,7 +111,7 @@ configurations.all {
     if(it.name.contains('AndroidTestRuntimeClasspath')) {
         it.resolutionStrategy {
             force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1-android'
+            force 'com.google.guava:guava:30.1.1-android'
         }
     }
     exclude group: "com.google.protobuf", module: "protobuf-java"
diff --git a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
index dd4b7579159..2193cab7b9e 100644
--- a/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
+++ b/firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/ComparatorTester.java
@@ -185,7 +185,7 @@ private void testNullCompare(Object obj) {
     if (comparator == null) {
       try {
         compare(obj, null);
-        assert_().fail("Expected NullPointerException in %s.compare(null)", obj);
+        assert_().withMessage("Expected NullPointerException in %s.compare(null)", obj).fail();
       } catch (NullPointerException expected) {
         // TODO(cpovirk): Consider accepting JavaScriptException under GWT
       }
@@ -196,7 +196,9 @@ private void testClassCast(Object obj) {
     if (comparator == null) {
       try {
         compare(obj, ICanNotBeCompared.INSTANCE);
-        assert_().fail("Expected ClassCastException in %s.compareTo(otherObject)", obj);
+        assert_()
+            .withMessage("Expected ClassCastException in %s.compareTo(otherObject)", obj)
+            .fail();
       } catch (ClassCastException expected) {
       }
     }
diff --git a/firebase-inappmessaging/firebase-inappmessaging.gradle b/firebase-inappmessaging/firebase-inappmessaging.gradle
index 4b4a4816608..83776e0b24f 100644
--- a/firebase-inappmessaging/firebase-inappmessaging.gradle
+++ b/firebase-inappmessaging/firebase-inappmessaging.gradle
@@ -99,7 +99,7 @@ configurations.all {
     if(it.name.contains('AndroidTestRuntimeClasspath')) {
         it.resolutionStrategy {
             force 'org.checkerframework:checker-compat-qual:2.5.5'
-            force 'com.google.guava:guava:30.1-android'
+            force 'com.google.guava:guava:30.1.1-android'
         }
     }
 }
@@ -129,7 +129,7 @@ dependencies {
     implementation "io.grpc:grpc-okhttp:$grpcVersion"
     implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'com.google.auto.value:auto-value-annotations:1.6.6'
+    implementation 'com.google.auto.value:auto-value-annotations:1.8.1'
 
     implementation('com.google.firebase:firebase-measurement-connector:18.0.2') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
diff --git a/firebase-messaging/firebase-messaging.gradle b/firebase-messaging/firebase-messaging.gradle
index f736e92cf12..4286983534d 100644
--- a/firebase-messaging/firebase-messaging.gradle
+++ b/firebase-messaging/firebase-messaging.gradle
@@ -129,7 +129,7 @@ dependencies {
     testImplementation 'com.google.guava:guava-testlib:12.0-rc2'
     testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
     testImplementation 'androidx.test:rules:1.2.0'
-    testImplementation 'androidx.test.ext:truth:1.2.0'
+    testImplementation 'androidx.test.ext:truth:1.4.0'
     testImplementation 'androidx.test.services:test-services:1.2.0'
     testImplementation 'androidx.core:core:1.6.0'
 }
diff --git a/firebase-perf/e2e-app/e2e-app.gradle b/firebase-perf/e2e-app/e2e-app.gradle
index d770d7bcba2..9a66e5ac318 100644
--- a/firebase-perf/e2e-app/e2e-app.gradle
+++ b/firebase-perf/e2e-app/e2e-app.gradle
@@ -85,7 +85,7 @@ dependencies {
 
     // Google Deps
     implementation "com.google.android.gms:play-services-tasks:18.0.1"
-    implementation "com.google.guava:guava:29.0-android"
+    implementation "com.google.guava:guava:30.1.1-android"
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation "androidx.recyclerview:recyclerview:1.1.0"