Merge "Fix ConcurrentModificationException in SummaryLoader."