Merge "Fix ConcurrentModificationException crash due to race in IpClient" am: 2a10846e04
am: 7776936533

Change-Id: If2d42129bc4d870a8bdf6c1143e72f88fb63ccf1