Merge "fix(psci): remove unreachable switch/case blocks" into integration