diff --git a/android/GKI_VERSION b/android/GKI_VERSION
index da598c937dca..704afe7fcfc7 100644
--- a/android/GKI_VERSION
+++ b/android/GKI_VERSION
@@ -1 +1 @@
-LTS_5.4.86_7d99cf8c84a7
+LTS_5.4.86_e399f16519fa
diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 2e8113c8c557..ff1a17ee7753 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -3967,6 +3967,7 @@
       <elf-symbol name='spi_bus_lock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1001acda'/>
       <elf-symbol name='spi_bus_unlock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4861f1cc'/>
       <elf-symbol name='spi_busnum_to_master' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x40920415'/>
+      <elf-symbol name='spi_set_cs_timing' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe80f6172'/>
       <elf-symbol name='spi_controller_resume' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3b6b9b70'/>
       <elf-symbol name='spi_controller_suspend' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9e6ee413'/>
       <elf-symbol name='spi_finalize_current_message' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x71c101fd'/>
@@ -128457,6 +128458,13 @@
         <parameter type-id='f22e4524' name='ctlr' filepath='drivers/spi/spi.c' line='2705' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
+      <function-decl name='spi_set_cs_timing' mangled-name='spi_set_cs_timing' filepath='drivers/spi/spi.c' line='3225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spi_set_cs_timing'>
+        <parameter type-id='e90f4666' name='spi' filepath='drivers/spi/spi.c' line='3225' column='1'/>
+        <parameter type-id='f9b06939' name='setup' filepath='drivers/spi/spi.c' line='3225' column='1'/>
+        <parameter type-id='f9b06939' name='hold' filepath='drivers/spi/spi.c' line='3225' column='1'/>
+        <parameter type-id='f9b06939' name='inactive_dly' filepath='drivers/spi/spi.c' line='3226' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='spi_busnum_to_master' mangled-name='spi_busnum_to_master' filepath='drivers/spi/spi.c' line='2741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spi_busnum_to_master'>
         <parameter type-id='1dc6a898' name='bus_num' filepath='drivers/spi/spi.c' line='2741' column='1'/>
         <return type-id='f22e4524'/>
diff --git a/android/abi_gki_aarch64_7d99cf8c84a7.xml b/android/abi_gki_aarch64_e399f16519fa.xml
similarity index 99%
rename from android/abi_gki_aarch64_7d99cf8c84a7.xml
rename to android/abi_gki_aarch64_e399f16519fa.xml
index f65ea5b69f70..f6a0b4d8467f 100644
--- a/android/abi_gki_aarch64_7d99cf8c84a7.xml
+++ b/android/abi_gki_aarch64_e399f16519fa.xml
@@ -94598,6 +94598,12 @@
         <parameter type-id='fa0b179b'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='strscpy' mangled-name='strscpy' filepath='include/linux/string.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'>
+        <parameter type-id='26a90f95'/>
+        <parameter type-id='80f4b756'/>
+        <parameter type-id='7359adad'/>
+        <return type-id='bd54fe1a'/>
+      </function-decl>
       <function-decl name='msleep' mangled-name='msleep' filepath='include/linux/delay.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='msleep'>
         <parameter type-id='f0981eeb'/>
         <return type-id='48b5725f'/>
@@ -128690,15 +128696,15 @@
         <parameter type-id='1ce53783'/>
         <return type-id='c894953d'/>
       </function-decl>
-      <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'>
-        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5319' column='1'/>
-        <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5319' column='1'/>
-        <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5320' column='1'/>
+      <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'>
+        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5322' column='1'/>
+        <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5322' column='1'/>
+        <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5323' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'>
-        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5326' column='1'/>
-        <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5326' column='1'/>
+      <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5329' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'>
+        <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5329' column='1'/>
+        <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5329' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='strnstr' mangled-name='strnstr' filepath='include/linux/string.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnstr'>
@@ -130490,12 +130496,6 @@
         <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='4553' column='1'/>
         <return type-id='f0981eeb'/>
       </function-decl>
-      <function-decl name='strscpy' mangled-name='strscpy' filepath='include/linux/string.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'>
-        <parameter type-id='26a90f95'/>
-        <parameter type-id='80f4b756'/>
-        <parameter type-id='7359adad'/>
-        <return type-id='bd54fe1a'/>
-      </function-decl>
       <function-decl name='ida_alloc_range' mangled-name='ida_alloc_range' filepath='include/linux/idr.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ida_alloc_range'>
         <parameter type-id='a9e764bb'/>
         <parameter type-id='f0981eeb'/>
diff --git a/android/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos
index 1f795dac9b27..4316e90e289d 100644
--- a/android/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
@@ -1598,6 +1598,7 @@
   uart_update_timeout
   uart_write_wakeup
   __udelay
+  ufshcd_config_pwr_mode
   ufshcd_dme_get_attr
   ufshcd_dme_set_attr
   ufshcd_pltfrm_init
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 15ac9a66a517..c2eacbe29161 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -198,6 +198,7 @@
   remove_proc_subtree
   request_firmware
   rtc_time64_to_tm
+  spi_set_cs_timing
   spi_sync
   strcat
   system_wq
diff --git a/android/abi_gki_aarch64_xiaomi b/android/abi_gki_aarch64_xiaomi
index 95acdab2fb70..824b53703ce5 100644
--- a/android/abi_gki_aarch64_xiaomi
+++ b/android/abi_gki_aarch64_xiaomi
@@ -16,6 +16,13 @@
   regcache_drop_region
   snd_soc_dapm_del_routes
 
+# required by us_prox.ko
+  iio_device_unregister
+  iio_device_free
+  __iio_device_register
+  __kfifo_to_user
+  iio_device_alloc
+
 # required by tfa98xx_dlkm.ko
   device_remove_bin_file
   snd_pcm_hw_constraint_mask64
@@ -32,15 +39,21 @@
 
 # required by msm_drm.ko
   kobject_set_name
+  wakeup_source_destroy
+  wakeup_source_remove
+  wakeup_source_add
+  wakeup_source_create
 
 # required by exfat.ko
   block_write_full_page
   __blockdev_direct_IO
   __bread_gfp
   __brelse
+  clear_nlink
   cont_write_begin
   d_find_alias
   d_move
+  d_splice_alias
   filemap_fdatawait_range
   filemap_fdatawrite_range
   full_name_hash
@@ -53,6 +66,7 @@
   generic_fillattr
   generic_write_end
   __getblk_gfp
+  igrab
   ilookup
   in_group_p
   inc_nlink
@@ -76,14 +90,20 @@
   sb_min_blocksize
   sb_set_blocksize
   setattr_copy
+  setattr_prepare
+  set_nlink
   sync_blockdev
   sync_dirty_buffer
   sync_mapping_buffers
   __remove_inode_hash
   touch_buffer
   truncate_pagecache
+  truncate_setsize
   unload_nls
   unlock_buffer
   utf16s_to_utf8s
   utf8s_to_utf16s
   write_inode_now
+
+# required by incrementalfs.ko
+  revert_creds