Merge "Apply ag/12775659 to IpClientManager."