Fixing order of commands and tasks in direct workflow

Change-Id: I80d2d8d758d9c49eb9a876c8408615151992d86f
Merge "Fixing order of commands and tasks in direct workflow"