am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev

* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99':
  Minor refactoring before starting on velocity tracker changes.