diff --git a/comet/overlay/frameworks/base/core/res/res/values/config.xml b/comet/overlay/frameworks/base/core/res/res/values/config.xml
index 69d2e0f..a50bb31 100644
--- a/comet/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/comet/overlay/frameworks/base/core/res/res/values/config.xml
@@ -299,6 +299,10 @@
          off rounded corners logic in LetterboxUiController. Values are in pixel. -->
     <integer name="config_letterboxActivityCornersRadius">64</integer>
 
+    <!-- Whether we should persist the brightness value in nits for the default display even if
+         the underlying display device changes. -->
+    <bool name="config_persistBrightnessNitsForDefaultDisplay">true</bool>
+
     <!-- The width in dp to use to detect vertical thin letterboxing.
          If W is the available width and w is the letterbox width, an app
          is thin letterboxed if the value here is < (W - w) / 2
diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index 09d29dc..704f662 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -158,4 +158,6 @@ on boot && property:ro.boot.warranty.sku=UVZ
     setprop setupwizard.feature.provisioning_profile_mode true
 on boot && property:ro.boot.warranty.sku=UTM
     setprop setupwizard.feature.provisioning_profile_mode true
-
+# Enable bootstrap for DVT for convenient testing (b/343731008)
+on boot && property:ro.boot.hardware.revision=DVT1.0
+    setprop setupwizard.feature.provisioning_profile_mode true
diff --git a/device-comet.mk b/device-comet.mk
index d02a2cc..21f3428 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-SHIPPING_API_LEVEL := 34
-
 ifdef RELEASE_GOOGLE_COMET_RADIO_DIR
 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR)
 endif