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

* commit 'b2e8a1b23c1e7cd0d12b7429adad023e25438a27':
  Only clear sync error map on success