Fix concurrent modifcation exception (issue 11234805)

Change-Id: I21a7e968c249b0d8876fbffa68954ddc229b16df
1 file changed