Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit