Merge changes I36e4d672,I47610cee into integration

* changes:
  Workaround for Cortex N1 erratum 1946160
  Workaround for Cortex A78 erratum 1951500