Merge "Fix timer jobs getting aborted from abandoning a change"