Merge "[Clean up] Remove debug logs" into udc-dev