Merge "Fix VelocityTracker for CTS tests"