am 772099e7: Merge "Rewrite VelocityTracker tests." into jb-dev

* commit '772099e738fdc8d01af65233e20ab88522d83808':
  Rewrite VelocityTracker tests.