am 25f6d3e6: am f7dea15b: am c9ffd746: Merge "Don\'t call setTask twice." into klp-dev

* commit '25f6d3e6e0d341239fc9ef56a6310e92bc5f21ce':
  Don't call setTask twice.