Merge changes from topic "am-eddb24f0a32a4116af2506a8a3f89680" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Remove unnecessary padding code" into sc-v2-dev am: a29b5c30 -s ours am: 04039860 -s ours am: cccdf78a -s ours am: a67df831 -s ours am: 1227a058 -s ours am: ad3559b9 -s ours
  [automerger skipped] Remove unnecessary padding code am: 3af48e44 -s ours am: 85fff460 -s ours am: 44e53eb8 -s ours am: 3a30ab66 -s ours am: a4ec189a -s ours am: 61a74437 -s ours