am f119af67: am 41148af5: Merge "Fix bug #7241988 Padding is mostly set to "0"" into jb-mr1-dev

* commit 'f119af675b77e34e791d3b02cae9401d0fdcfc06':
  Fix bug #7241988 Padding is mostly set to "0"