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