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

Change-Id: Ie13ed70165359e8f312a3744cc26a8d1b6f4730c