am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"

* commit '9a9481f89b26211b20d7f3fde3d54b455843bf70':
  More 32-bit only