Merge "Remove static builder method." into udc-dev