Merge "Fix ConcurrentModificationException in SyncManager."