am 46002293: Merge "Fix to handle ConcurrentModificationException" into mnc-dev

* commit '46002293dbb08fdf21dddf0bf205638f674f5afa':
  Fix to handle ConcurrentModificationException