am: 03d0a3ae * commit '03d0a3ae': Handle trampoline activites in different tasks Change-Id: I5ed39794c95de8fa36388cb9080a5727837c9ee2