[OS-BUILD PATCH] Fix interruptible non MR jobs