fixup! Add TaskTree definitions more directly Remove now unused taskList variable. Change-Id: I0bfd1754542dece70f2c3d6e6a1c51b392678c0c