am 79f4ec3f: Merge "Fix arm64 bug introduced by refactoring."

* commit '79f4ec3fb3bccc4436328eef132c7c6e7db9ef32':
  Fix arm64 bug introduced by refactoring.