diff --git a/OWNERS b/OWNERS
index 72b1f7a..168edac 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
 per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/device-comet.mk b/device-comet.mk
index d8716df..062fc28 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -261,7 +261,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # HdMic Audio
 PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/comet/prebuilt/libspeechenhancer
 PRODUCT_PROPERTY_OVERRIDES += \
-    persist.vendor.audio.hdmic.version=1
+    persist.vendor.app.audio.gsenet.version=1
 PRODUCT_PACKAGES += \
     libspeechenhancer
 
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index c75f395..03dc158 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -1,4 +1,3 @@
-GlueLayer_IsUseNfwLocAccess=0
 GlueLayer_ToolConfigSelection=3
 debug_console=0
 debug_enable=0
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 0168a82..ea11f2b 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -1,4 +1,3 @@
-GlueLayer_IsUseNfwLocAccess=0
 ############################################
 GlueLayer_ToolConfigSelection=3
 user_ports_tcp_name=Autotest
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 502d825..360b12f 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -476,16 +476,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "BigTjOffset",
       "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled",
@@ -850,15 +840,6 @@
         "67000"
       ],
       "ResetOnInit": true
-    },
-    {
-      "Name": "PA_KILL",
-      "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb",
-      "Values": [
-        "102400",
-        "0"
-      ],
-      "ResetOnInit": false
     }
   ],
   "Actions": [
@@ -1152,12 +1133,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1331,13 +1306,6 @@
       "Duration": 0,
       "Value": "0x80"
     },
-    {
-      "PowerHint": "CAMERA_LAUNCH",
-      "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
-      "Duration": 0,
-      "Value": "102400"
-    },
     {
       "PowerHint": "CAMERA_LAUNCH",
       "Node": "CPUSkipMask",