Do not use raw coordinates in VelocityTracker
am: 4c3137a9d3

Change-Id: Ie7324fad5b1d28319ecff13fb42b2b8d1f98c88b