Work around Riviera 2019.10 issue
Work around Riviera 2019.10 issue

This is a Riviera issue and will be fixed in a next release. Add a
workaround in the meantime.

Riviera issue reference: DZI370

AmbiML/ibex,AmbiML/ibex,lowRISC/ibex,AmbiML/ibex,lowRISC/ibex,lowRISC/ibex,AmbiML/ibex,lowRISC/ibex