Merge changes I97c00d5a,Iab1699c4 into main

* changes:
  Fix sanitizer error
  Revert "Fix hwasan error for CAN HAL"