Merge "Fixing concurrent modification exception. (Bug 6807320)"