Merge "Fix CredDesc reg flow bugs" into udc-dev