am 3605b380: Merge "Fix 64bit compilation issues with IndirectRef."

* commit '3605b38097f91a59f7148683509f87ec3799364b':
  Fix 64bit compilation issues with IndirectRef.