Merge "Handle trampoline activites in different tasks" into nyc-dev
am: 0d35765ca3

* commit '0d35765ca343ae7b04df7a93c233e5b6860eec22':
  Handle trampoline activites in different tasks

Change-Id: I0f930e67f9cf179d7b819df9969979b12be0b929