Merge "fix(errata): workarounds for cortex-x1 errata" into integration