Revert "Fix to not mark a valid preloaded subtask as INVALID" This reverts commit ba8f1423d2e7cc502a8af95bf87d365755d47c0f. Reason for revert: Better approach at Ieff1da7a47b63514fb8d0437340e096e03ad54bd Change-Id: I0b67bb426dd6422a6459601096aa66f2bd4253a0