Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028 am: c498f6301e am: 55d1997d51
am: 4c9f111a6d

Change-Id: I8e487ef6b725f0380548fcb4af47e04b12eb5704