Merge "Remove unused debug logs" into udc-dev