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

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

Change-Id: I9de9ac5a6e42f75dd8a8c4c9f07c60efb48aa2b7