Merge \"Convert activation to task\" into nyc-mr1-dev
am: 97e2de6eeb

Change-Id: I896dca5455bcc24d9bda032d4e21f32750982260