am 25e17ef6: am de8c7526: Merge "Give scheduled jobs a more substantial timeslice" into mnc-dev

* commit '25e17ef6d7f56d0f157b799bfc2ad0315b413286':
  Give scheduled jobs a more substantial timeslice