am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1

* commit '4bd6ccd25162a7634a90cfde72dcdc7d581d9a88':
  Restore save/restore calls removed recently