am 195f8f0f: (-s ours) am d96f4bcd: am 350b426b: Update VelocityTracker tests. (DO NOT MERGE)

* commit '195f8f0f8b4c713ae7c62f1b8562e95a7b9edf9b':
  Update VelocityTracker tests. (DO NOT MERGE)