Fix evaluating task parameters

Change-Id: I5ee4b5ae22017e607f283ccfb19f86a27317e7cf
Merge "Fix evaluating task parameters"