Merge "Rename a constant in VelocityTracker"