diff --git a/.pick_status.json b/.pick_status.json
index 3e713c7c6a6..3f96509903b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4144,7 +4144,7 @@
         "description": "anv: handle missing astc for gfx125 in CreateImageView",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index eae27976913..50b3b3b569d 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -3005,6 +3005,10 @@ VkResult anv_CreateDevice(
       vk_device_dispatch_table_from_entrypoints(&dispatch_table, &doom64_device_entrypoints, true);
       override_initial_entrypoints = false;
    }
+#ifdef ANDROID
+   vk_device_dispatch_table_from_entrypoints(&dispatch_table, &android_device_entrypoints, true);
+   override_initial_entrypoints = false;
+#endif
    vk_device_dispatch_table_from_entrypoints(&dispatch_table,
       anv_genX(&physical_device->info, device_entrypoints),
       override_initial_entrypoints);
diff --git a/src/intel/vulkan/layers/anv_android_layer.c b/src/intel/vulkan/layers/anv_android_layer.c
new file mode 100644
index 00000000000..e36eb820ab6
--- /dev/null
+++ b/src/intel/vulkan/layers/anv_android_layer.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2023 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "anv_private.h"
+
+VKAPI_ATTR VkResult VKAPI_CALL
+android_CreateImageView(VkDevice _device,
+                        const VkImageViewCreateInfo *pCreateInfo,
+                        const VkAllocationCallbacks *pAllocator,
+                        VkImageView *pView)
+{
+   ANV_FROM_HANDLE(anv_device, device, _device);
+   const struct util_format_description *fmt =
+      vk_format_description(pCreateInfo->format);
+
+   /* Throw error in case application tries to create ASTC view on gfx125.
+    * This is done to avoid gpu hang that can result in using the unsupported
+    * format.
+    */
+   if (fmt && fmt->layout == UTIL_FORMAT_LAYOUT_ASTC &&
+       device->info->verx10 >= 125) {
+      return vk_errorf(device, VK_ERROR_OUT_OF_HOST_MEMORY,
+                       "ASTC format not supported (%s).", __func__);
+   }
+   return anv_CreateImageView(_device, pCreateInfo, pAllocator, pView);
+}
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 5d63983af0d..be8a37e847b 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -41,7 +41,8 @@ anv_entrypoints = custom_target(
     '--device-prefix', 'gfx12',
     '--device-prefix', 'gfx125',
     '--device-prefix', 'doom64',
-    '--device-prefix', 'hitman3'
+    '--device-prefix', 'hitman3',
+    '--device-prefix', 'android'
   ],
   depend_files : vk_entrypoints_gen_depend_files,
 )
@@ -137,6 +138,7 @@ libanv_files = files(
   'i915/anv_kmd_backend.c',
   'layers/anv_doom64.c',
   'layers/anv_hitman3.c',
+  'layers/anv_android_layer.c',
   'xe/anv_batch_chain.c',
   'xe/anv_batch_chain.h',
   'xe/anv_kmd_backend.c',