am 00ff4748: Merge "More VelocityTracker refactoring." into jb-dev

* commit '00ff47484f8137aa3e59f680ff07d2662cfb4088':
  More VelocityTracker refactoring.