Merge "Remove stray commas in javadoc" into udc-dev