Merge "Change trace tag." into udc-dev