Merge "Remove unnecessary padding code" into sc-qpr1-dev