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

* commit '6f600e6c099a5c90350577443d773e4532acbc51':