am a54edd7e: Merge "TaskManager API first pass."

* commit 'a54edd7eb31e641630d594de37b3ee9ce6ddfa61':
  TaskManager API first pass.