Merge "fix(sgi): apply workarounds for N2 CPU erratum" into integration