diff --git a/android/guava/src/com/google/common/collect/ForwardingConcurrentMap.java b/android/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
index ef6893c03732..51eb005641f2 100644
--- a/android/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
+++ b/android/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
@@ -66,6 +66,7 @@ public boolean remove(@Nullable Object key, @Nullable Object value) {
 
   @CanIgnoreReturnValue
   @Override
+  @SuppressWarnings("nullness") // https://github.com/jspecify/jdk/issues/118
   public boolean replace(K key, V oldValue, V newValue) {
     return delegate().replace(key, oldValue, newValue);
   }
diff --git a/android/guava/src/com/google/common/collect/TreeBasedTable.java b/android/guava/src/com/google/common/collect/TreeBasedTable.java
index 5bbc39351aba..4b507d5ea8a5 100644
--- a/android/guava/src/com/google/common/collect/TreeBasedTable.java
+++ b/android/guava/src/com/google/common/collect/TreeBasedTable.java
@@ -121,7 +121,9 @@ public static <R, C, V> TreeBasedTable<R, C, V> create(
    */
   public static <R, C, V> TreeBasedTable<R, C, V> create(TreeBasedTable<R, C, ? extends V> table) {
     TreeBasedTable<R, C, V> result =
-        new TreeBasedTable<>(table.rowKeySet().comparator(), table.columnComparator());
+        // requireNonNull is safe, as discussed in rowComparator() below.
+        new TreeBasedTable<>(
+            requireNonNull(table.rowKeySet().comparator()), table.columnComparator());
     result.putAll(table);
     return result;
   }
diff --git a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
index ef6893c03732..51eb005641f2 100644
--- a/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
+++ b/guava/src/com/google/common/collect/ForwardingConcurrentMap.java
@@ -66,6 +66,7 @@ public boolean remove(@Nullable Object key, @Nullable Object value) {
 
   @CanIgnoreReturnValue
   @Override
+  @SuppressWarnings("nullness") // https://github.com/jspecify/jdk/issues/118
   public boolean replace(K key, V oldValue, V newValue) {
     return delegate().replace(key, oldValue, newValue);
   }
diff --git a/guava/src/com/google/common/collect/TreeBasedTable.java b/guava/src/com/google/common/collect/TreeBasedTable.java
index 5bbc39351aba..4b507d5ea8a5 100644
--- a/guava/src/com/google/common/collect/TreeBasedTable.java
+++ b/guava/src/com/google/common/collect/TreeBasedTable.java
@@ -121,7 +121,9 @@ public static <R, C, V> TreeBasedTable<R, C, V> create(
    */
   public static <R, C, V> TreeBasedTable<R, C, V> create(TreeBasedTable<R, C, ? extends V> table) {
     TreeBasedTable<R, C, V> result =
-        new TreeBasedTable<>(table.rowKeySet().comparator(), table.columnComparator());
+        // requireNonNull is safe, as discussed in rowComparator() below.
+        new TreeBasedTable<>(
+            requireNonNull(table.rowKeySet().comparator()), table.columnComparator());
     result.putAll(table);
     return result;
   }