Merge changes Ifea8148e,I73559522 into integration

* changes:
  fix(morello): include errata workaround for 1868343
  fix(errata): workaround for Rainier erratum 1868343