Merge "Revert remaining debug logs added for b/260260325" into udc-qpr-dev