Merge "Fix ConcurrentModificationException crash due to race in IpClient" am: 2a10846e am: 77769365 am: 9efb85b5 Change-Id: I3c0f4504f02b49cf1790be7a56eb0bd948694731