diff --git a/java/com/android/dialer/assisteddialing/ConcreteCreator.java b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
index 73817d7..5236ea8 100644
--- a/java/com/android/dialer/assisteddialing/ConcreteCreator.java
+++ b/java/com/android/dialer/assisteddialing/ConcreteCreator.java
@@ -41,8 +41,7 @@
   // Floor set at N due to use of Optional.
   protected static final int BUILD_CODE_FLOOR = Build.VERSION_CODES.N;
   // Ceiling set at O_MR1 because this feature will ship as part of the framework in P.
-  // TODO(erfanian): Switch to public build constant when 27 is available in public master.
-  @VisibleForTesting public static final int BUILD_CODE_CEILING = 27;
+  @VisibleForTesting public static final int BUILD_CODE_CEILING = Build.VERSION_CODES.O_MR1;
 
   /**
    * Creates a new AssistedDialingMediator