Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over home\\\"\\\" into nyc-dev am: 5c176ff133 am: 01cc848c6d
am: e9f326e8d6

Change-Id: Icfb23fadd2efdd9b37e080797752fc5ce0d2a57e