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

Change-Id: I04b03ff7cee505e8322320ec3d0ee10e6dbf2b09