Merge "Add more logging to debug b/270770472" into udc-dev