Merge "Restore save/restore calls removed recently" into honeycomb-mr1