Using original taskInfo to create the taskKey instead of fake data

Change-Id: Ie4e35b35484e0f6cb939febe6357b37381d81682
(cherry picked from commit fabfb3ae90524fef748ed35e6edf578a20789689)
7 files changed