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

* commit '12505ca2f8db8b9856e3d36dc572b75810c878d3':
  unused private members removed from AccountSyncSettings unused local variable removed from AddAccountSettings override warnings fixed for SyncActivityTooManyDeletes