Signed-off-by: Rob Bradford <rbradford@rivosinc.com> (cherry picked from commit 307a0166c5c0bd623f26f5701d9ee60f3b6641be)