Merge "Remove the TODO comment from the public doc" into udc-dev