Merge "Update UpstreamNetworkMonitor to use custom Handlers" am: 35c89886c2 am: 46175db538
am: c239511cdb

Change-Id: I9a210b4896810e7365b2403495716395b3866650
tree: 9d289caa2e38b652c26e91945fd2065231bc6409
  1. core/
  2. services/
  3. tests/