Increasing activated-task wait time to 60000 ms am: f9bf37d569
am: 42c8e85e5e

Change-Id: I5e0919ff7d668f354158d7b86abcbcea8e8066cc