am: 0d35765c * commit '0d35765c': Handle trampoline activites in different tasks Change-Id: I0f930e67f9cf179d7b819df9969979b12be0b929