Merge "Increase time interval in points provided to VelocityTracker" into froyo