Merge \"Don\'t update task to return to type for last task over home\" into nyc-mr1-dev
am: fc20505e37

Change-Id: I10017faa09457bc930734b415ff518d5be81ee71