Merge "Clean-up b/260135164 logs" into udc-qpr-dev