Merge "Revert "Disable tests that require stubgraph for riscv"" into main