Merge "Touch watchdog before freeing objs in max_concurrent" into oc-dev