Merge "Handle IpReachabilityMonitor errors better."