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

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