Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am:...
Merge "Merge "Handle trampoline activites in different tasks" into nyc-dev am: 0d35765c am: 03d0a3ae" into nyc-mr1-dev-plus-aosp
am: 3b5aac25
* commit '3b5aac25':
Handle trampoline activites in different tasks
Change-Id: I369dc499ac8edadf3a3ec0fe3bfce23753331268