Merge "Reschedule jobs that crash partway through" into oc-dev
am: 4a0e84b454

Change-Id: I4462c39784cbd93d0799edfc899d627230890afc