diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index 9d23f97..8b4b17d 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -26,6 +26,7 @@ USES_IDISPLAY_INTF_SEC := true
 
 include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
+-include vendor/google_devices/comet/proprietary/BoardConfigVendor.mk
 include device/google/comet-sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk
 
diff --git a/comet/overlay_packages/SettingsCometOverlay/Android.bp b/comet/overlay_packages/SettingsCometOverlay/Android.bp
new file mode 100644
index 0000000..7b40d10
--- /dev/null
+++ b/comet/overlay_packages/SettingsCometOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsCometOverlay",
+    product_specific: true,
+}
diff --git a/comet/overlay_packages/SettingsCometOverlay/AndroidManifest.xml b/comet/overlay_packages/SettingsCometOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..8ba8a4d
--- /dev/null
+++ b/comet/overlay_packages/SettingsCometOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.comet">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png
new file mode 100644
index 0000000..19bd99c
Binary files /dev/null and b/comet/overlay_packages/SettingsCometOverlay/res/drawable/regulatory_info_gc15s_cn.png differ
diff --git a/comet/overlay_packages/SettingsCometOverlay/res/values/config.xml b/comet/overlay_packages/SettingsCometOverlay/res/values/config.xml
new file mode 100644
index 0000000..2495437
--- /dev/null
+++ b/comet/overlay_packages/SettingsCometOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.comet</string>
+</resources>
diff --git a/device-comet.mk b/device-comet.mk
index 7d970c3..32cae1e 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -28,6 +28,7 @@ endif
 $(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-vendor-comet.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk)
 $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk)
 $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)