am d65b2308: Merge "Use public API to get padding" into jb-dev

* commit 'd65b23089c90edcf2808ccccf8f918b6155cc2ec':
  Use public API to get padding