Merge "unused private members removed from AccountSyncSettings unused local variable removed from AddAccountSettings override warnings fixed for SyncActivityTooManyDeletes"