diff --git a/mediaprovider_flags.aconfig b/mediaprovider_flags.aconfig
index 1ddbb50..082869f 100644
--- a/mediaprovider_flags.aconfig
+++ b/mediaprovider_flags.aconfig
@@ -158,6 +158,15 @@
 }
 
 flag {
+    name: "enable_photopicker_datescrubber"
+    is_exported: true
+    namespace: "mediaprovider"
+    description: "This flag controls whether to enable datescrubber feature in photopicker"
+    bug: "312640456"
+    is_fixed_read_only: true
+}
+
+flag {
     name: "cloud_media_provider_search"
     is_exported: true
     namespace: "mediaprovider"
diff --git a/photopicker/src/com/android/photopicker/core/configuration/ConfigurationManager.kt b/photopicker/src/com/android/photopicker/core/configuration/ConfigurationManager.kt
index 5054f17..d333f4b 100644
--- a/photopicker/src/com/android/photopicker/core/configuration/ConfigurationManager.kt
+++ b/photopicker/src/com/android/photopicker/core/configuration/ConfigurationManager.kt
@@ -330,6 +330,7 @@
                     /* defaultValue= */ FEATURE_PICKER_CHOICE_MANAGED_SELECTION.second,
                 ),
             PICKER_SEARCH_ENABLED = Flags.enablePhotopickerSearch(),
+            PICKER_DATESCRUBBER_ENABLED = Flags.enablePhotopickerDatescrubber(),
             PICKER_TRANSCODING_ENABLED = Flags.enablePhotopickerTranscoding(),
         )
     }
diff --git a/photopicker/src/com/android/photopicker/core/configuration/PhotopickerFlags.kt b/photopicker/src/com/android/photopicker/core/configuration/PhotopickerFlags.kt
index 271892d..dc5a9af 100644
--- a/photopicker/src/com/android/photopicker/core/configuration/PhotopickerFlags.kt
+++ b/photopicker/src/com/android/photopicker/core/configuration/PhotopickerFlags.kt
@@ -45,6 +45,7 @@
     val PRIVATE_SPACE_ENABLED: Boolean = FEATURE_PRIVATE_SPACE_ENABLED.second,
     val MANAGED_SELECTION_ENABLED: Boolean = FEATURE_PICKER_CHOICE_MANAGED_SELECTION.second,
     val PICKER_SEARCH_ENABLED: Boolean = Flags.enablePhotopickerSearch(),
+    val PICKER_DATESCRUBBER_ENABLED: Boolean = Flags.enablePhotopickerDatescrubber(),
     val PICKER_TRANSCODING_ENABLED: Boolean = Flags.enablePhotopickerTranscoding(),
     val OWNED_PHOTOS_ENABLED: Boolean = Flags.revokeAccessOwnedPhotos(),
     val EXPRESSIVE_THEME_ENABLED: Boolean = Flags.enablePhotopickerExpressiveTheme(),
@@ -62,6 +63,7 @@
         if (PRIVATE_SPACE_ENABLED != other.PRIVATE_SPACE_ENABLED) return false
         if (MANAGED_SELECTION_ENABLED != other.MANAGED_SELECTION_ENABLED) return false
         if (PICKER_SEARCH_ENABLED != other.PICKER_SEARCH_ENABLED) return false
+        if (PICKER_DATESCRUBBER_ENABLED != other.PICKER_DATESCRUBBER_ENABLED) return false
         if (PICKER_TRANSCODING_ENABLED != other.PICKER_TRANSCODING_ENABLED) return false
 
         return true
@@ -79,6 +81,7 @@
             PRIVATE_SPACE_ENABLED,
             MANAGED_SELECTION_ENABLED,
             PICKER_SEARCH_ENABLED,
+            PICKER_DATESCRUBBER_ENABLED,
             PICKER_TRANSCODING_ENABLED,
         )
 }