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

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