Merge "Fix short-service TODOs" into udc-dev