Merge "Do not use raw coordinates in VelocityTracker" am: 43ce20f384 am: 509029ae35
am: 1a9514e9c5

Change-Id: I6381bdaf39a2ba668d952bbbd94c6ed697da3511