Delete trunk_staging as this config is not supported for AOSP releases.

Bug: b/415779582
Test: https://android-build.corp.google.com/abtd/run/L27500030011766217
Change-Id: Iab49e07da10bab5365ef0f7d643383b64741cf9c

134 files changed, 0 insertions, 546 deletions

diff --git a/flag_values/trunk_staging/OWNERS b/flag_values/trunk_staging/OWNERS
deleted file mode 100644
index c5c7a93f..00000000
--- a/flag_values/trunk_staging/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-per-file RELEASE_KERNEL*.textproto=aaronding@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=achant@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=cyanhsieh@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=wangjj@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=yichunko@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL*.textproto=zhengpan@google.com # For updating kernel flag values in trunk_staging
-per-file RELEASE_KERNEL_ORIOLE_DIR.textproto=baligh@google.com # b/376076241
-per-file RELEASE_KERNEL_RAVEN_DIR.textproto=baligh@google.com  # b/37607624
-per-file RELEASE_KERNEL_ORIOLE_DIR.textproto=achant@google.com # b/37607624
-per-file RELEASE_KERNEL_RAVEN_DIR.textproto=achant@google.com  # b/37607624
diff --git a/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto b/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto
deleted file mode 100644
index 377e9497..00000000
--- a/flag_values/trunk_staging/RELEASE_ACONFIG_CHECK_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ACONFIG_CHECK_API_LEVEL"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto b/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto
deleted file mode 100644
index 4b1b5489..00000000
--- a/flag_values/trunk_staging/RELEASE_ACONFIG_NEW_EXPORTED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ACONFIG_NEW_EXPORTED"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto b/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto
deleted file mode 100644
index e3a70bca..00000000
--- a/flag_values/trunk_staging/RELEASE_APEX_MOUNT_DATA_APEX_EARLY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APEX_MOUNT_DATA_APEX_EARLY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto b/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto
deleted file mode 100644
index fb1d366e..00000000
--- a/flag_values/trunk_staging/RELEASE_APEX_USE_EROFS_PREINSTALLED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APEX_USE_EROFS_PREINSTALLED"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto b/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto
deleted file mode 100644
index c65d74e1..00000000
--- a/flag_values/trunk_staging/RELEASE_APKCERTS_INSTALL_ONLY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_APKCERTS_INSTALL_ONLY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto b/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
deleted file mode 100644
index e5b76ccb..00000000
--- a/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_APPFUNCTION_SIDECAR"
-value:  {
-  bool_value:  true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto b/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto
deleted file mode 100644
index 3e0a5613..00000000
--- a/flag_values/trunk_staging/RELEASE_ATTEST_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ATTEST_MODULES"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto b/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto
deleted file mode 100644
index a6c93f4d..00000000
--- a/flag_values/trunk_staging/RELEASE_AVATAR_PICKER_APP.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVATAR_PICKER_APP"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto b/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
deleted file mode 100644
index c063a168..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ALLOW_PREINSTALLED_APPS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ALLOW_PREINSTALLED_APPS"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
deleted file mode 100644
index 582c6fbb..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
deleted file mode 100644
index 03d69f33..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_DICE_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_DICE_CHANGES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto
deleted file mode 100644
index 7f76d598..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_EARLY_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_EARLY_VM"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
deleted file mode 100644
index d4705ded..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_LLPVM_CHANGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_LLPVM_CHANGES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto
deleted file mode 100644
index f625296c..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MICROFUCHSIA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MICROFUCHSIA"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
deleted file mode 100644
index 2f54f752..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
deleted file mode 100644
index 2594a9fe..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_NETWORK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
deleted file mode 100644
index b24d9b35..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_REMOTE_ATTESTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_REMOTE_ATTESTATION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
deleted file mode 100644
index ed85ec5b..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
deleted file mode 100644
index 15bbdcbd..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VENDOR_MODULES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VENDOR_MODULES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
deleted file mode 100644
index e157895e..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VIRT_CPUFREQ.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_ENABLE_VIRT_CPUFREQ"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto
deleted file mode 100644
index 180d9263..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_VM_TO_TEE_SERVICES_ALLOWLIST"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
deleted file mode 100644
index ffdabf95..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_WIDEVINE_PVM"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto b/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto
deleted file mode 100644
index 40e0d136..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_FIX_VM_FILES_STORAGE_LOCATION_b359439878"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
deleted file mode 100644
index 9c3ca6b5..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto b/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
deleted file mode 100644
index b6e3b2c8..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_MICRODROID_KERNEL_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_MICRODROID_KERNEL_VERSION"
-value: {
-  string_value: "android15_66"
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto b/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto
deleted file mode 100644
index 7a25f56c..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
deleted file mode 100644
index 48050256..00000000
--- a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto b/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
deleted file mode 100644
index acf8a88d..00000000
--- a/flag_values/trunk_staging/RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto b/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto
deleted file mode 100644
index c72f3c18..00000000
--- a/flag_values/trunk_staging/RELEASE_BLUETOOTH_SOCKET_SERVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BLUETOOTH_SOCKET_SERVICE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto b/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto
deleted file mode 100644
index 839e3f93..00000000
--- a/flag_values/trunk_staging/RELEASE_BOARD_API_LEVEL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BOARD_API_LEVEL"
-value: {
-  string_value: "202604"
-}
diff --git a/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto b/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto
deleted file mode 100644
index 4e2b4697..00000000
--- a/flag_values/trunk_staging/RELEASE_BPF_ENABLE_LIBBPF.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_BPF_ENABLE_LIBBPF"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto
deleted file mode 100644
index 6df1a6f4..00000000
--- a/flag_values/trunk_staging/RELEASE_BUILD_USE_VARIANT_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_BUILD_USE_VARIANT_FLAGS"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto b/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto
deleted file mode 100644
index 34354f93..00000000
--- a/flag_values/trunk_staging/RELEASE_CRASHRECOVERY_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CRASHRECOVERY_MODULE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto b/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
deleted file mode 100644
index f6e24469..00000000
--- a/flag_values/trunk_staging/RELEASE_CREATE_ACONFIG_STORAGE_FILE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_CREATE_ACONFIG_STORAGE_FILE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto b/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto
deleted file mode 100644
index 86ca4e2a..00000000
--- a/flag_values/trunk_staging/RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_DEFAULT_UPDATABLE_MODULE_VERSION"
-value:  {
-  string_value:  "361099999"
-}
diff --git a/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto b/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto
deleted file mode 100644
index 694494da..00000000
--- a/flag_values/trunk_staging/RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ENABLE_MAINLINE_ACONFIGD_SOCKET"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto b/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto
deleted file mode 100644
index 4a3b4ee2..00000000
--- a/flag_values/trunk_staging/RELEASE_ENABLE_TOT_CRONET.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ENABLE_TOT_CRONET"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto b/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
deleted file mode 100644
index de851fce..00000000
--- a/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ETM_IN_USERDEBUG_ENG"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto b/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto
deleted file mode 100644
index 4a681d22..00000000
--- a/flag_values/trunk_staging/RELEASE_EXPORTED_FLAG_CHECK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_EXPORTED_FLAG_CHECK"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto b/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto
deleted file mode 100644
index b1788d3c..00000000
--- a/flag_values/trunk_staging/RELEASE_FINGERPRINT_ACONFIG_PACKAGES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_FINGERPRINT_ACONFIG_PACKAGES"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 8b97f2d2..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 37c6e280..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 7a40dccf..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 4f6be5cb..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 5057404f..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto
deleted file mode 100644
index 94e402e9..00000000
--- a/flag_values/trunk_staging/RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto b/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto
deleted file mode 100644
index 5ce00a76..00000000
--- a/flag_values/trunk_staging/RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_HARDWARE_AUDIO_USE_CAP_AIDL"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto b/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto
deleted file mode 100644
index e6622a3d..00000000
--- a/flag_values/trunk_staging/RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_HC_PHR_FHIR_STRUCTURAL_VALIDATION"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto b/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto
deleted file mode 100644
index f36ea9e0..00000000
--- a/flag_values/trunk_staging/RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
deleted file mode 100644
index 21527223..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_AKITA_DIR"
-value: {
-  string_value: "device/google/akita-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
deleted file mode 100644
index 2543b334..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_AKITA_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
deleted file mode 100644
index 6bda53de..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_DIR"
-value: {
-  string_value: "device/google/bluejay-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
deleted file mode 100644
index 963d174e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_BLUEJAY_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
deleted file mode 100644
index 2ed9fb80..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CAIMAN_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
deleted file mode 100644
index 2f0aea24..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_DIR"
-value: {
-  string_value: "device/google/pantah-kernels/6.1/trunk-13227750"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto
deleted file mode 100644
index d3782a99..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_CHEETAH_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
deleted file mode 100644
index bd0ed928..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_COMET_DIR"
-value: {
-  string_value: "device/google/comet-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
deleted file mode 100644
index aa4c86f3..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_DIR"
-value: {
-  string_value: "device/google/felix-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
deleted file mode 100644
index 34b51f48..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_FELIX_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
deleted file mode 100644
index 15dd9a92..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto
deleted file mode 100644
index d244e572..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_HUSKY_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
deleted file mode 100644
index 30754937..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_KOMODO_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
deleted file mode 100644
index 1e471dec..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_DIR"
-value: {
-  string_value: "device/google/lynx-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
deleted file mode 100644
index b306617a..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_LYNX_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
deleted file mode 100644
index 1326c4d6..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_DIR"
-value: {
-  string_value: "device/google/raviole-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
deleted file mode 100644
index cf1bb600..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_ORIOLE_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
deleted file mode 100644
index 23d057d0..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_DIR"
-value: {
-  string_value: "device/google/pantah-kernels/6.1/trunk-13227750"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
deleted file mode 100644
index 539e1714..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_PANTHER_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
deleted file mode 100644
index d93d2360..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_DIR"
-value: {
-  string_value: "device/google/raviole-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto
deleted file mode 100644
index c4916660..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RAVEN_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
deleted file mode 100644
index 9e5b0695..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT24_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-12482486"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
deleted file mode 100644
index c9b65d36..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENTPRO_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-12482486"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
deleted file mode 100644
index 1e83515e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
deleted file mode 100644
index d717768c..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
deleted file mode 100644
index c461818e..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_DIR"
-value: {
-  string_value: "device/google/shusky-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
deleted file mode 100644
index aeaa0b3b..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_SHIBA_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
deleted file mode 100644
index 0355441d..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_DIR"
-value: {
-  string_value: "device/google/tangorpro-kernels/6.1/trunk-13211717"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
deleted file mode 100644
index 2763aafe..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TANGORPRO_VERSION"
-value: {
-  string_value: "6.1"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
deleted file mode 100644
index c4ffd503..00000000
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KERNEL_TOKAY_DIR"
-value: {
-  string_value: "device/google/caimito-kernels/6.1/trunk-13248619"
-}
diff --git a/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto
deleted file mode 100644
index 98b9839a..00000000
--- a/flag_values/trunk_staging/RELEASE_KOTLIN_LANG_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_KOTLIN_LANG_VERSION"
-value: {
-  string_value: "2"
-}
diff --git a/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto b/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
deleted file mode 100644
index d31771e1..00000000
--- a/flag_values/trunk_staging/RELEASE_LARGE_SYSTEM_PROPERTY_NODE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LARGE_SYSTEM_PROPERTY_NODE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto
deleted file mode 100644
index 6681b8e2..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_ADDSERVICE_CACHE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LIBBINDER_ADDSERVICE_CACHE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
deleted file mode 100644
index 97e354b6..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_LIBBINDER_CLIENT_CACHE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto
deleted file mode 100644
index ff759880..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_LIBBINDER_REMOVE_CACHE_STATIC_LIST"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto b/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
deleted file mode 100644
index ced836ea..00000000
--- a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto b/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto
deleted file mode 100644
index 202d2a23..00000000
--- a/flag_values/trunk_staging/RELEASE_MEMORY_MANAGEMENT_DAEMON.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_MEMORY_MANAGEMENT_DAEMON"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto b/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto
deleted file mode 100644
index 07d80a8b..00000000
--- a/flag_values/trunk_staging/RELEASE_MOVE_VCN_TO_MAINLINE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_MOVE_VCN_TO_MAINLINE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto b/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto
deleted file mode 100644
index fe2dbfa9..00000000
--- a/flag_values/trunk_staging/RELEASE_NDK_ABI_MONITORED.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_NDK_ABI_MONITORED"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto b/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto
deleted file mode 100644
index d2f0c3a7..00000000
--- a/flag_values/trunk_staging/RELEASE_NFC_MAINLINE_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_NFC_MAINLINE_MODULE"
-value: {
-  bool_value: true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 58d80332..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_EMOJI_FONT_VERSION"
-value: {
-  string_value: "2.047"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
deleted file mode 100644
index 40bd0cb2..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_FLAG_EMOJI_FONT_VERSION"
-value: {
-  string_value: "2.047"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
deleted file mode 100644
index 22219363..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_HENTAIGANA_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_HENTAIGANA_FONT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
deleted file mode 100644
index 5e124ee3..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_LIBSQLITE3.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_LIBSQLITE3"
-value: {
-  string_value: "3440400"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto
deleted file mode 100644
index e64f06e3..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION"
-value:  {
-  string_value:  "CombinedMessageQueue/MessageQueue.java"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto
deleted file mode 100644
index f0b126a9..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_NFC_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NFC_STACK"
-value: {
-  string_value: "com.android.nfcservices"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto
deleted file mode 100644
index d212c4c6..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_NOTO_SANS_KHMER_VERSION"
-value {
-  string_value: "2.004"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto
deleted file mode 100644
index fe523590..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_PROFILING_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_PROFILING_MODULE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
deleted file mode 100644
index 6bfbf143..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VARIABLE_NOTO_SANS_CJK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
deleted file mode 100644
index 54fe1061..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_VIRTUAL_CAMERA.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_VIRTUAL_CAMERA"
-value: {
-  string_value: "virtual_camera"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto
deleted file mode 100644
index 698a5277..00000000
--- a/flag_values/trunk_staging/RELEASE_PACKAGE_WEBVIEW_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PACKAGE_WEBVIEW_VERSION"
-value {
-  string_value: "133.0.6943.137"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
deleted file mode 100644
index a2cfb0b2..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_EXTENSION_VERSION"
-value:  {
-  string_value:  "17"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto
deleted file mode 100644
index e3fdfa58..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_VERSION"
-value:  {
-  string_value:  "36"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto
deleted file mode 100644
index 8728065a..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_VERSION_FULL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_SDK_VERSION_FULL"
-value:  {
-  string_value:  "36.0"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
deleted file mode 100644
index 05aaa6d2..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ /dev/null
@@ -1,5 +0,0 @@
-name: "RELEASE_PLATFORM_SECURITY_PATCH"
-value: {
-  string_value: "2025-06-05"
-}
-
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
deleted file mode 100644
index 1fd909e8..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_CODENAMES"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
deleted file mode 100644
index 4f6b4bdc..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto
deleted file mode 100644
index 1a2f6c39..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_CODENAME.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_CODENAME"
-value: {
-  string_value: "Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto
deleted file mode 100644
index 6d1cd9d4..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES"
-value: {
-  string_value: "Base,Base11,Cupcake,Donut,Eclair,Eclair01,EclairMr1,Froyo,Gingerbread,GingerbreadMr1,Honeycomb,HoneycombMr1,HoneycombMr2,IceCreamSandwich,IceCreamSandwichMr1,JellyBean,JellyBeanMr1,JellyBeanMr2,Kitkat,KitkatWatch,Lollipop,LollipopMr1,M,N,NMr1,O,OMr1,P,Q,R,S,Sv2,Tiramisu,UpsideDownCake,VanillaIceCream,Baklava"
-}
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto
deleted file mode 100644
index 49eae7f0..00000000
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_VERSION_LAST_STABLE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_VERSION_LAST_STABLE"
-value:  {
-  string_value:  "16"
-}
diff --git a/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto
deleted file mode 100644
index 4cdfc7c6..00000000
--- a/flag_values/trunk_staging/RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_R8_GLOBAL_CHECK_NOT_NULL_FLAGS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto b/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto
deleted file mode 100644
index e2d7d963..00000000
--- a/flag_values/trunk_staging/RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto b/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto
deleted file mode 100644
index c2cadfa8..00000000
--- a/flag_values/trunk_staging/RELEASE_RANGING_STACK.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_RANGING_STACK"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto b/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto
deleted file mode 100644
index 4922414b..00000000
--- a/flag_values/trunk_staging/RELEASE_READ_FROM_NEW_STORAGE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_READ_FROM_NEW_STORAGE"
-value: {
-  bool_value: true
-}
\ No newline at end of file
diff --git a/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto b/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
deleted file mode 100644
index 291e5aae..00000000
--- a/flag_values/trunk_staging/RELEASE_REMOVE_LEGACY_EMOJI_FONT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_REMOVE_LEGACY_EMOJI_FONT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto b/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
deleted file mode 100644
index 8f9fa825..00000000
--- a/flag_values/trunk_staging/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SELINUX_DATA_DATA_IGNORE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto b/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto
deleted file mode 100644
index 78450489..00000000
--- a/flag_values/trunk_staging/RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SERVICE_WIFI_SPEED_PROFILE_ART_COMPILATION"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto b/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
deleted file mode 100644
index 99db9278..00000000
--- a/flag_values/trunk_staging/RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SM_OPEN_DECLARED_PASSTHROUGH_HAL"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto b/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto
deleted file mode 100644
index 450722e3..00000000
--- a/flag_values/trunk_staging/RELEASE_SOONG_ONLY_CUTTLEFISH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SOONG_ONLY_CUTTLEFISH"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto b/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto
deleted file mode 100644
index 66ce2939..00000000
--- a/flag_values/trunk_staging/RELEASE_SUPERVISION_SERVICE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_SUPERVISION_SERVICE"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto b/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto
deleted file mode 100644
index a887fc4a..00000000
--- a/flag_values/trunk_staging/RELEASE_SYSTEMUI_USE_SPEED_PROFILE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_SYSTEMUI_USE_SPEED_PROFILE"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto b/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto
deleted file mode 100644
index 7d336557..00000000
--- a/flag_values/trunk_staging/RELEASE_TARGET_JAVA_21.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_TARGET_JAVA_21"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto b/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto
deleted file mode 100644
index 6005e058..00000000
--- a/flag_values/trunk_staging/RELEASE_UI_SOUNDS_DIR.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UI_SOUNDS_DIR"
-value {
-  string_value: "effects2025"
-}
diff --git a/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto b/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto
deleted file mode 100644
index 9330b11e..00000000
--- a/flag_values/trunk_staging/RELEASE_UNLOCKED_STORAGE_API.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UNLOCKED_STORAGE_API"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto b/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto
deleted file mode 100644
index ce917474..00000000
--- a/flag_values/trunk_staging/RELEASE_UPROBESTATS_MODULE.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_UPROBESTATS_MODULE"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto b/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto
deleted file mode 100644
index b7faf52e..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_DEX_V41.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_DEX_V41"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto b/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto
deleted file mode 100644
index a54e60c3..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_OPTIMIZED_RESOURCE_SHRINKING_BY_DEFAULT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto b/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto
deleted file mode 100644
index 9bcea668..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_RESOURCE_PROCESSOR_BY_DEFAULT"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto b/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto
deleted file mode 100644
index e1a666f7..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_SYSTEM_FEATURE_BUILD_FLAGS"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto b/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto
deleted file mode 100644
index b210b0a5..00000000
--- a/flag_values/trunk_staging/RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_USE_TRANSITIVE_JARS_IN_CLASSPATH"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto b/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto
deleted file mode 100644
index 955cafda..00000000
--- a/flag_values/trunk_staging/RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_WIFI_MAINLINE_SUPPLICANT_BINARY"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto b/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
deleted file mode 100644
index 4f37937d..00000000
--- a/flag_values/trunk_staging/RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"
-value: {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto b/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto
deleted file mode 100644
index 76f2ccdf..00000000
--- a/flag_values/trunk_staging/RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name: "RELEASE_ZUMAPRO_TARGET_ARCH_VARIANT_ARMV92"
-value {
-  bool_value: true
-}
diff --git a/flag_values/trunk_staging/TEST_MAPPING b/flag_values/trunk_staging/TEST_MAPPING
deleted file mode 100644
index f7d9a379..00000000
--- a/flag_values/trunk_staging/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "imports": [
-    {
-       "path": "vendor/unbundled_google/packages/SystemUIGoogle"
-    }
-  ]
-}
\ No newline at end of file