am 68bc6d3a: Merge "Work-around 64bit build issues."

* commit '68bc6d3a464adced9aed74dee03642556639ec21':
  Work-around 64bit build issues.