Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e am: 305796276b
am: 1559d51f86

Change-Id: I4cbcc423be83613555e69f894e2d09004d363e5a