Merge "Update UpstreamNetworkMonitor to use custom Handlers" am: 35c89886c2
am: 279a4feb72

Change-Id: I7f9e1a775e08363d9006f1dbb7af61d0d8e41043