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

Change-Id: Ib4c34608802e1180df2175edae8736a6e78a269f