Merge branch '2022-03-02-scmi-updates' into next

- A small set of scmi updates