am c0da873e: am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev

* commit 'c0da873ee25e1e67fd0454ebc2473a5c3cac002c':
  Use the same interrupt/resume logic for all functor calls