Merge "hal: Fix static analysis issue"