Merge tag 'LA.UM.9.6.2.c26-02500-89xx.0' into int/11/fp3

"LA.UM.9.6.2.c26-02500-89xx.0"

* tag 'LA.UM.9.6.2.c26-02500-89xx.0':
  hal: Fix CFI errors

Change-Id: Ie0a1b57a8b2e4d247680962d5a760e13d5c4f310