Merge "Ensure cancel is called in RunUtil" into oc-dev