Merge "Remove the magic 32 constant and ensure alignment."
am: d700afabe2

* commit 'd700afabe2ae5c6ac181866a7b461ec06d0258be':
  Remove the magic 32 constant and ensure alignment.