Merge changes I03b8b712,I62688119

* changes:
  Fix assertion failure in TaskPositionerTest
  Fix NPE in TaskPositionerTest