Merge "New TraceUtilsTest" into udc-dev