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

Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98