diff --git a/BoardConfig-16k-common.mk b/BoardConfig-16k-common.mk
index 0571d7a5..4b9c64ab 100644
--- a/BoardConfig-16k-common.mk
+++ b/BoardConfig-16k-common.mk
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),)
+
 ifeq ($(TARGET_BOOTS_16K),true)
 # Configures the 16kb kernel directory.
 TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb
@@ -35,3 +37,5 @@ BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(
 
 BOARD_16K_OTA_MOVE_VENDOR := true
 endif
+
+endif
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 895ce99b..ead4cd93 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -114,7 +114,7 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>12</version>
+        <version>13</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>