am 93578af2: Merge "Velocity Tracker II: The Revenge of Velocity Tracker Bug: 5265529"

* commit '93578af23ecfb8f5b6001346d63c6214cdec5d17':
  Velocity Tracker II: The Revenge of Velocity Tracker Bug: 5265529