Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2