diff --git a/build.gradle b/build.gradle
index 0fd95e3e400..8bda4e8de8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '28.0.0'
     googleTruthVersion = '1.1.2'
-    grpcVersion = '1.48.1'
+    grpcVersion = '1.50.2'
     robolectricVersion = '4.9'
     protocVersion = '3.17.3'
     javaliteVersion = '3.17.3'
diff --git a/firebase-firestore/CHANGELOG.md b/firebase-firestore/CHANGELOG.md
index 139a04f5d88..10be6868218 100644
--- a/firebase-firestore/CHANGELOG.md
+++ b/firebase-firestore/CHANGELOG.md
@@ -1,9 +1,10 @@
 # Unreleased
 - [fixed] Fix FAILED_PRECONDITION when writing to a deleted document in a transaction.
-  (#5871).
-
-- [fixed] Fixed Firestore failing to raise initial snapshot from empty local cache result.
-- [fixed] Removed invalid suggestions to use `GenericTypeIndicator` from error messages.
+  ([Issue #5871](//github.com/firebase/firebase-android-sdk/issues/5871))
+- [fixed] Fixed Firestore failing to raise initial snapshot from empty local cache result. ([PR](https://github.com/firebase/firebase-android-sdk/pull/4207))
+- [fixed] Removed invalid suggestions to use `GenericTypeIndicator` from error messages. ([Issue 222](https://github.com/firebase/firebase-android-sdk/issues/222))
+- [changed] Updated dependency of `io.grpc.*` to its latest
+  version (v1.50.2).
 
 # 24.4.0
 * [feature] Added