Merge changes I1e8c2bc3,I9bcff306 into integration

* changes:
  errata: workaround for Cortex-A710 errata 2081180
  errata: workaround for Cortex-A710 errata 1987031