diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index a941626..10b0e24 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -21,6 +21,7 @@
 import com.android.dialer.DialerPhoneNumber;
 import com.android.dialer.phonelookup.PhoneLookup;
 import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -56,12 +57,15 @@
     }
     return Futures.transform(
         Futures.allAsList(futures),
-        infos -> {
-          PhoneLookupInfo.Builder mergedInfo = PhoneLookupInfo.newBuilder();
-          for (PhoneLookupInfo info : infos) {
-            mergedInfo.mergeFrom(info);
+        new Function<List<PhoneLookupInfo>, PhoneLookupInfo>() {
+          @Override
+          public PhoneLookupInfo apply(List<PhoneLookupInfo> infos) {
+            PhoneLookupInfo.Builder mergedInfo = PhoneLookupInfo.newBuilder();
+            for (PhoneLookupInfo info : infos) {
+              mergedInfo.mergeFrom(info);
+            }
+            return mergedInfo.build();
           }
-          return mergedInfo.build();
         },
         MoreExecutors.directExecutor());
   }
