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

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