Merge "Adding debug tracing for b/262282528" into udc-dev