am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity...
am 47272c93: am b12b6b51: Merge "Minor refactoring before starting on velocity tracker changes." into jb-dev
* commit '47272c93':
Minor refactoring before starting on velocity tracker changes.