Merge "Fixed a concurrent modification crash" into nyc-dev
am: f9f48ecd4c

* commit 'f9f48ecd4c59429550909c050a1317eca31b324f':
  Fixed a concurrent modification crash

Change-Id: I776698ffa8378e634554674e29dccea486b6cb13