Merge "Merge "Remove task based on object rather than position" into nyc-dev...
Merge "Merge "Remove task based on object rather than position" into nyc-dev am: e1293b7d am: 339b0654" into nyc-mr1-dev-plus-aosp
am: 25cc1530
* commit '25cc1530':
Change-Id: I41fe3ede83b8307afe73bc16ec89fe243b94e694