am ff7ae2dc: Merge "Correct save/restore match up" into jb-mr2-dev

* commit 'ff7ae2dccd3b8ba015963126d8a655b417d3fcd3':
  Correct save/restore match up