am cd569b31: am e8a94224: Merge "Return tasks in correct order." into klp-dev

* commit 'cd569b31d398fe846eeee567d2816a3bb93dd493':
  Return tasks in correct order.