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

* commit 'cd8a9f51e163c82de7bf7b00877d5f8273099263':