Merge "Handle IpReachabilityMonitor errors better." into nyc-mr2-dev am: 88424ed1b2
am: 7add842b43

Change-Id: I39d90c71f173b72b1193d4a5f511da3d01813287