Merge "Remove TODO as no needed to change after revisit" into udc-dev