Do not use raw coordinates in VelocityTracker am: 4c3137a9d3
am: b46fc185a7

Change-Id: I1c008899e3197399237edd14bc728dfa21dbcdc1