Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d am: cbd3d8b3 am: 08226334 am: 190d8591 Change-Id: I255691753279b370e85c4bde1930b7e2f45cd109