Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a