Server error does not mean synchronization is failed
Merge branch 'master' into ice-cream-sandwich