am daafaff8: am baea5269: Merge "Add TaskManager API" into jb-mr2-dev

* commit 'daafaff83965acbda157669e7c48a2caa55d37bc':
  Add TaskManager API