Merge "fix(smccc): resolve caller world confusion" into integration