Merge "Move explicit mobile request handling into UpstreamNetworkMonitor" am: caf62d305e
am: a94e66868c

Change-Id: Ie4d1cf3ef1729fc92de6a209a66e2e1ad386fb32