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-mr1-dev am: fc20505e\" into nyc-mr1-dev-plus-aosp
am: 29344e7e
Change-Id: Id34e78f870e67f5bef30c7855c3fa778000759d5