Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2