am e7c9a387: Merge "Fix 64bit build"

* commit 'e7c9a387fa190b786b1f7becfe99cb22a6f2934a':
  Fix 64bit build