Merge changes I18b28a3a,I4439342c

* changes:
  Use vector in VelocityTracker_test
  Refactor VelocityTracker_test