Merge "Remove unnecessary padding code" into tm-qpr-dev