Merge "hal: Fix compilation issue seen when a feature flag is defined"