merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I95ca40513c2acdba4378d776a7158a65ee724adf
Only clear sync error map on success

We don't want to clear the error map unless there was a successful
sync.  Otherwise, the device will attempt a sync evert 15 seconds

This is the first part of the fix for bug 7567773

Change-Id: Icd0e70d87a7f588e242f0f100ee0b36b3aa85d89
Merge tag 'android-4.2.2_r1' into jellybean

Android 4.2.2 release 1