Merge "fix(errata): workaround for Cortex-X2 erratum 2147715" into integration