Merge "fix long overflow when enable DEBUG_ACCELERATION"