Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028
am: c498f6301e

Change-Id: I79421b04547c0ac3ea39d7222e21597668bddd49