Merge "Start of UpstreamNetworkMonitor unittests" am: f9a28d7ba4 am: 4bb6f5a418 am: 5eba88cf44
am: abeb9205fe

Change-Id: Ib1f2f813eec62e702455d60946f7d4d789ff9c88