Merge "hal: update combo device handling"