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

* changes:
  [automerger skipped] Merge "Remove unnecessary padding code" into sc-qpr1-dev am: d149f773 -s ours am: 10a35dda -s ours am: 91c0b2f6 -s ours am: 258c3dfb -s ours am: 8c7563a4 -s ours am: adb89c03 -s ours am: 3f62c1c9 -s ours
  [automerger skipped] Remove unnecessary padding code am: f86a4892 -s ours am: faf00b0f -s ours am: 08be6c57 -s ours am: 8b706fd9 -s ours am: 6599ab24 -s ours am: 306a5e9e -s ours am: ba0cc75e -s ours