Merge " hal: Fix mismatch in acdb configs for SWB"