Merge "Handle IpReachabilityMonitor errors better." am: 3af34c8e0a
am: 4467b79592

Change-Id: I5d4d2d9888d85a684425b8204785099f818e6546