Merge \"Merge \\\"Don\\\'t update task to return to type for last task over...
Merge \"Merge \\\"Don\\\'t update task to return to type for last task over home\\\" into nyc-dev am: 62b08eb5 am: ad36bf7a\" into nyc-mr1-dev-plus-aosp
am: 5e8c48a3
Change-Id: I651a6e9a540eac3664ec277ca961697cb3bf13a3