Merge "Update velocity tracker tests. Bug: 5265529"