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

Change-Id: I1eba1d1d64d0fadb3c19217cc7478d67887bc6f6