am ea7e877b: am 0fc0cd0d: am 6f600e6c: am cd8a9f51: am edc43805: am b6d33df9: Fix concurrent modifcation exception (issue 11234805)

* commit 'ea7e877ba2ee4e807f9edee69dc5ad495e7d8b54':