Merge "Cleanup IpReachabilityMonitor" into tm-dev