Merge "Reland "Make VelocityTracker 1D" (--try 2)"