Merge "Do not use raw coordinates in VelocityTracker"
am: 43ce20f384

Change-Id: I172db0c67269608b15c579497be335ee948ae9b0