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