am edc43805: am b6d33df9: Fix concurrent modifcation exception (issue 11234805)

* commit 'edc43805e3d65608b39d9271aee97e45904d85dd':
  Fix concurrent modifcation exception (issue 11234805)