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