am 08b544c7: Merge "Fix pointer indexing issue in VelocityTracker." into jb-dev

* commit '08b544c7be67343b10a4130611318b8273d06433':
  Fix pointer indexing issue in VelocityTracker.