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

Change-Id: I1e734f1d82712a2893ac83f6e67d6770468e07e4