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: dccff8d4
am: e91f766d
Change-Id: Ib5a8bfec2e66141f9d4d58540acfb53f95520afd