Merge "refactor(el3-spmc): avoid unneeded function call" into integration