am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error"

* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
  Fix error overwriting when restoring error