diff --git a/BUILD.bazel b/BUILD.bazel
index f780ffd87460..8a7f131ba6e7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -26,6 +26,7 @@ _aarch64_additional_kmi_symbol_lists = [
     "android/abi_gki_aarch64_fips140",
     "android/abi_gki_aarch64_generic",
     "android/abi_gki_aarch64_hikey960",
+    "android/abi_gki_aarch64_type_visibility",
     "android/abi_gki_aarch64_virtual_device",
 ]
 
diff --git a/android/abi_gki_aarch64_type_visibility b/android/abi_gki_aarch64_type_visibility
new file mode 100644
index 000000000000..4f826b7b1f87
--- /dev/null
+++ b/android/abi_gki_aarch64_type_visibility
@@ -0,0 +1,4 @@
+[abi_symbol_list]
+
+# for type visibility
+  GKI_struct_blk_mq_alloc_data
diff --git a/block/Makefile b/block/Makefile
index af3d044abaf1..05daaf8282a1 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -39,3 +39,4 @@ obj-$(CONFIG_BLK_SED_OPAL)	+= sed-opal.o
 obj-$(CONFIG_BLK_PM)		+= blk-pm.o
 obj-$(CONFIG_BLK_INLINE_ENCRYPTION)	+= keyslot-manager.o blk-crypto.o
 obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK)	+= blk-crypto-fallback.o
+obj-$(CONFIG_ANDROID_VENDOR_HOOKS) += vendor_hooks.o
diff --git a/block/vendor_hooks.c b/block/vendor_hooks.c
new file mode 100644
index 000000000000..db033b9e2835
--- /dev/null
+++ b/block/vendor_hooks.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* vendor_hook.c
+ *
+ * Copyright 2022 Google LLC
+ */
+#include "blk.h"
+#include "blk-mq-tag.h"
+#include "blk-mq.h"
+#include <linux/blk-mq.h>
+
+#define CREATE_TRACE_POINTS
+#include <trace/hooks/vendor_hooks.h>
+#include <linux/tracepoint.h>
+#include <trace/hooks/block.h>
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_alloc_rqs);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_rq_ctx_init);
+
+/*
+ * For type visibility
+ */
+const struct blk_mq_alloc_data *GKI_struct_blk_mq_alloc_data;
+EXPORT_SYMBOL_GPL(GKI_struct_blk_mq_alloc_data);
+
diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 45f1caeb3ff6..dde70d69dd33 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -11,6 +11,7 @@ Image.gz
 ABI_DEFINITION=android/abi_gki_aarch64.xml
 KMI_SYMBOL_LIST=android/abi_gki_aarch64
 ADDITIONAL_KMI_SYMBOL_LISTS="
+android/abi_gki_aarch64_type_visibility
 android/abi_gki_aarch64_core
 android/abi_gki_aarch64_fips140
 android/abi_gki_aarch64_generic
diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 8ddb3f6664fc..d313d85eb576 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -62,7 +62,6 @@
 #include <trace/hooks/iommu.h>
 #include <trace/hooks/thermal.h>
 #include <trace/hooks/ufshcd.h>
-#include <trace/hooks/block.h>
 #include <trace/hooks/cgroup.h>
 #include <trace/hooks/workqueue.h>
 #include <trace/hooks/sys.h>
@@ -270,8 +269,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_insert);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_node_delete);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_node_replace);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_lookup);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_alloc_rqs);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_rq_ctx_init);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_commit_creds);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_creds);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_override_creds);