Merge "Fix typos in various code places" into udc-dev