am 61ab1618: Merge "Fix 32-bit build."

* commit '61ab1618a8347c503e9185a4d17b957e367bac1b':
  Fix 32-bit build.