Merge "hal: Fix combo device issue with routing change"