Merge "Start of UpstreamNetworkMonitor unittests" am: f9a28d7ba4
am: 4bb6f5a418

Change-Id: I6a9106fd4fef85451104593ab8c37d4539cb9223