Merge "Fix arm64 bug introduced by refactoring."