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

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