Merge "Handle IpReachabilityMonitor errors better." into nyc-mr2-dev