diff --git a/device-caiman.mk b/device-caiman.mk
index ff1b7d80..81cb85b0 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
 ifdef RELEASE_KERNEL_CAIMAN_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
+
+include device/google/caimito/device-caimito-16k-common.mk
+
 else
 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
diff --git a/device-caimito-16k-common.mk b/device-caimito-16k-common.mk
new file mode 100644
index 00000000..b969354a
--- /dev/null
+++ b/device-caimito-16k-common.mk
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+ifeq ($(TARGET_BOOTS_16K),true)
+# Configures the 16kb kernel directory.
+TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
+endif
diff --git a/device-komodo.mk b/device-komodo.mk
index 5b4f491a..4f1563af 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
 ifdef RELEASE_KERNEL_KOMODO_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
+
+include device/google/caimito/device-caimito-16k-common.mk
+
 else
 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
diff --git a/device-tokay.mk b/device-tokay.mk
index 0d2c19a3..a02291d4 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -27,6 +27,9 @@ $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOA
 ifdef RELEASE_KERNEL_TOKAY_DIR
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
+
+include device/google/caimito/device-caimito-16k-common.mk
+
 else
 TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 52f47d8f..8d2bdd3c 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -579,16 +579,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",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index d9cd3f5a..26cc289e 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -579,16 +579,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",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 9d8ceacf..cb48d792 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -569,16 +569,6 @@
       "Type": "Property",
       "ResetOnInit": true
     },
-    {
-      "Name": "PowerHALLaunch",
-      "Path": "vendor.powerhal.is_launch",
-      "Values": [
-        "1",
-        "0"
-      ],
-      "Type": "Property",
-      "ResetOnInit": true
-    },
     {
       "Name": "INTCAMFreq",
       "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq",
@@ -1056,12 +1046,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1343,9 +1327,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 52f47d8f..8d2bdd3c 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -579,16 +579,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",
@@ -1130,12 +1120,6 @@
       "Duration": 5000,
       "Value": "1"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "PowerHALLaunch",
-      "Duration": 5000,
-      "Value": "1"
-    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUSkipMask",
@@ -1423,9 +1407,8 @@
       "Value": "0"
     },
     {
-      "PowerHint": "CAMERA_LAUNCH",
+      "PowerHint": "CAMERA_PA_KILL_BOOST",
       "Node": "PA_KILL",
-      "EnableProperty": "vendor.powerhal.is_launch",
       "Duration": 0,
       "Value": "102400"
     },