Merge "Add extra info to log to hopefully narrow it down" into udc-dev