Rebase of origin/master on upstream/master.
Rebase of origin/master on upstream/master.

Signed-off-by: Jason Hoddinett <7882bd25e43b58004086e4653e6e56785e4dadbe@opentitan.org>

lowRISC/opentitan,lowRISC/opentitan,lowRISC/opentitan,lowRISC/opentitan,lowRISC/opentitan,lowRISC/opentitan