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

Change-Id: Icf0ac5ea30fb0a72038979793ea8c673963a7764