am 946334b3: am 0bae5b22: Merge "Moved paddingStart to -v17 folder." into jb-ub-now-kermit

* commit '946334b3d3f5cd0390f35022217cec95338dd01f':
  Moved paddingStart to -v17 folder.