Merge "Remove unnecessary padding code" into udc-dev