Merge "Change order of arguments to traceAsync" into udc-qpr-dev