am a44f9a35: am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."

* commit 'a44f9a35a284c600616a7f2213a861ecdefd5615':
  Help catch common 32/64-bit errors.