Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1