am 458944fd: am b2e8a1b2: am 2fd0058c: Only clear sync error map on success

* commit '458944fd75bfe5b717102f34205f739f1dcf50e3':
  Only clear sync error map on success