Merge "Don't purge *all* sync information when a user is deleted." into qt-dev...
Merge "Don't purge *all* sync information when a user is deleted." into qt-dev am: e74523c9 am: c901e482
am: 4c404de4
Change-Id: I9dffaa46af7874b573a22dd3bf25330148e5caea