Merge "Improve short service debug log" into udc-dev