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: 1189b1a3
* commit '1189b1a3':
Change-Id: I0936677aff8a2ad634e37d98d84bdb9fcfc24d72