move task lookup logic to core

Change-Id: I25b6b0022882fb74988f509fe7eb09274a3279f8
2 files changed