Merge \"Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over home\\\"\\\" into nyc-dev am: 5c176ff133 am: 1315d0cb9f\" into nyc-mr1-dev-plus-aosp
am: 7bd8849515

Change-Id: I05ef0142d2092c82ea3f29c5dff42cb21387ca30