Merge "fix(arm): remove critical handoff code from assert" into integration