Merge "Remove getEstimator from VelocityTracker"