Merge "Fix ConcurrentModificationException crash due to race in IpClient"