Merge "fix(scmi): fix compilation error in scmi base" into integration