Merge "Clean up UIDGenerator field comments"