Merge "cnss2: Fix mhi compilation errors"