diff --git a/android/guava/src/com/google/common/collect/FluentIterable.java b/android/guava/src/com/google/common/collect/FluentIterable.java
index 0abfb481c11a..4cc0d043c106 100644
--- a/android/guava/src/com/google/common/collect/FluentIterable.java
+++ b/android/guava/src/com/google/common/collect/FluentIterable.java
@@ -465,9 +465,9 @@ public final boolean allMatch(Predicate<? super E> predicate) {
    *
    * <p><b>{@code Stream} equivalent:</b> {@code stream.filter(predicate).findFirst()}.
    */
-  @SuppressWarnings("nullness") // Unsafe, but we can't do much about it now.
   public final Optional<@NonNull E> firstMatch(Predicate<? super E> predicate) {
-    return Iterables.<E>tryFind((Iterable<@NonNull E>) getDelegate(), predicate);
+    // Unsafe, but we can't do much about it now.
+    return Iterables.<@NonNull E>tryFind((Iterable<@NonNull E>) getDelegate(), predicate);
   }
 
   /**
diff --git a/guava/src/com/google/common/collect/FluentIterable.java b/guava/src/com/google/common/collect/FluentIterable.java
index 8d1b67864bbf..f5d7050ba86b 100644
--- a/guava/src/com/google/common/collect/FluentIterable.java
+++ b/guava/src/com/google/common/collect/FluentIterable.java
@@ -462,9 +462,9 @@ public final boolean allMatch(Predicate<? super E> predicate) {
    *
    * <p><b>{@code Stream} equivalent:</b> {@code stream.filter(predicate).findFirst()}.
    */
-  @SuppressWarnings("nullness") // Unsafe, but we can't do much about it now.
   public final Optional<@NonNull E> firstMatch(Predicate<? super E> predicate) {
-    return Iterables.<E>tryFind((Iterable<@NonNull E>) getDelegate(), predicate);
+    // Unsafe, but we can't do much about it now.
+    return Iterables.<@NonNull E>tryFind((Iterable<@NonNull E>) getDelegate(), predicate);
   }
 
   /**