Merge "fix(psci): potential array overflow with cpu on" into integration