Merge "hal: Fix for acdb id mismatch on device switch"